From deccc46d93793098204cdc1405d9aac4bc9e80ae Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Wed, 1 Mar 2023 00:10:22 +0330 Subject: golang lint fixes --- telebot/Dockerfile | 4 +++ telebot/go.mod | 1 + telebot/telebot.go | 83 +++++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 74 insertions(+), 14 deletions(-) (limited to 'telebot') diff --git a/telebot/Dockerfile b/telebot/Dockerfile index a3cebf9..e123c95 100644 --- a/telebot/Dockerfile +++ b/telebot/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:3.16 as builder ENV GOPROXY=https://goproxy.io +ENV ALL_PROXY=socks5://192.168.1.214:9995 +ENV HTTPS_PROXY=socks5://192.168.1.214:9995 RUN apk update && apk upgrade RUN apk add go git ENV GOPROXY=https://goproxy.io @@ -18,4 +20,6 @@ FROM alpine:3.16 COPY --from=certbuilder /certs /certs COPY --from=builder /telebot/telebot /telebot/ COPY ./docker-entrypoint.sh /telebot/ +ENV ALL_PROXY= +ENV HTTPS_PROXY= ENTRYPOINT ["/telebot/docker-entrypoint.sh"] diff --git a/telebot/go.mod b/telebot/go.mod index d035e69..dab826a 100644 --- a/telebot/go.mod +++ b/telebot/go.mod @@ -7,5 +7,6 @@ require ( github.com/rs/zerolog v1.26.0 github.com/technoweenie/multipartstreamer v1.0.1 // indirect github.com/terminaldweller/grpc v1.0.3 + golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d google.golang.org/grpc v1.42.0 ) diff --git a/telebot/telebot.go b/telebot/telebot.go index 0676ce9..d452519 100644 --- a/telebot/telebot.go +++ b/telebot/telebot.go @@ -5,57 +5,108 @@ import ( "flag" "fmt" "net" + "net/http" "os" "strconv" + "time" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api" "github.com/rs/zerolog/log" pb "github.com/terminaldweller/grpc/telebot/v1" + "golang.org/x/net/proxy" "google.golang.org/grpc" ) -var ( - flagPort = flag.String("port", "8000", "determined the port the sercice runs on") - - // FIXME-the client should provide the channel ID - botChannelID = flag.Int64("botchannelid", 146328407, "determines the channel id the telgram bot should send messages to") -) +// FIXME-the client should provide the channel ID. +var botChannelID = flag.Int64( + "botchannelid", + 146328407, //nolint: gomnd + "determines the channel id the telgram bot should send messages to") const ( - TELEGRAM_BOT_TOKEN_ENV_VAR = "TELEGRAM_BOT_TOKEN" - SERVER_DEPLOYMENT_TYPE = "SERVER_DEPLOYMENT_TYPE" + telegramBotTokenEnvVar = "TELEGRAM_BOT_TOKEN" //nolint: gosec + httpClientTimeout = 5 ) type server struct { pb.UnimplementedNotificationServiceServer } +func GetProxiedClient() (*http.Client, error) { + proxyURL := os.Getenv("ALL_PROXY") + if proxyURL == "" { + proxyURL = os.Getenv("HTTPS_PROXY") + } + + dialer, err := proxy.SOCKS5("tcp", proxyURL, nil, proxy.Direct) + if err != nil { + return nil, fmt.Errorf("[GetProxiedClient] : %w", err) + } + + dialContext := func(ctx context.Context, network, address string) (net.Conn, error) { + netConn, err := dialer.Dial(network, address) + if err == nil { + return netConn, nil + } + + return netConn, fmt.Errorf("[dialContext] : %w", err) + } + + transport := &http.Transport{ + DialContext: dialContext, + DisableKeepAlives: true, + } + client := &http.Client{ + Transport: transport, + Timeout: httpClientTimeout * time.Second, + CheckRedirect: nil, + Jar: nil, + } + + return client, nil +} + func getTGBot() *tgbotapi.BotAPI { - token := os.Getenv(TELEGRAM_BOT_TOKEN_ENV_VAR) - bot, err := tgbotapi.NewBotAPI(token[1 : len(token)-1]) + token := os.Getenv(telegramBotTokenEnvVar) + + client, err := GetProxiedClient() + if err != nil { + log.Fatal().Err(err) + } + + bot, err := tgbotapi.NewBotAPIWithClient(token[1:len(token)-1], client) if err != nil { - log.Error().Err(err) + log.Fatal().Err(err) } + return bot } func sendMessage(bot *tgbotapi.BotAPI, msgText string, channelID int64) error { msg := tgbotapi.NewMessage(channelID, msgText) - bot.Send(msg) - return nil + _, err := bot.Send(msg) + + return err } -func (s *server) Notify(ctx context.Context, NotificationRequest *pb.NotificationRequest) (*pb.NotificationResponse, error) { +func (s *server) Notify( + ctx context.Context, + NotificationRequest *pb.NotificationRequest, +) (*pb.NotificationResponse, error) { var err error + tgbotapi := getTGBot() + if NotificationRequest.ChannelId == 0 { err = sendMessage(tgbotapi, NotificationRequest.NotificationText, *botChannelID) } else { err = sendMessage(tgbotapi, NotificationRequest.NotificationText, NotificationRequest.ChannelId) } + if err != nil { return &pb.NotificationResponse{Error: err.Error(), IsOK: false}, err } + return &pb.NotificationResponse{Error: "", IsOK: true}, nil } @@ -69,13 +120,17 @@ func startServer(port uint16) { grpcServer := grpc.NewServer(opts...) pb.RegisterNotificationServiceServer(grpcServer, &server{}) + if err := grpcServer.Serve(listener); err != nil { log.Fatal().Err(err) } } func main() { + flagPort := flag.String("port", "8000", "determines the port the service runs on") flag.Parse() + port, _ := strconv.Atoi(*flagPort) + startServer(uint16(port)) } -- cgit v1.2.3