From 43f087e51bba3f4411285be6f28809f8095e75b1 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Fri, 10 Apr 2020 12:33:56 +0800 Subject: [PATCH] Improve DN42 related whois handling --- frontend/dn42.go | 2 +- frontend/telegram_bot.go | 10 ++++++++++ proxy/Dockerfile.amd64 | 2 +- proxy/Dockerfile.arm32v7 | 2 +- proxy/Dockerfile.arm64v8 | 2 +- proxy/Dockerfile.i386 | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/frontend/dn42.go b/frontend/dn42.go index e9ef6fb..7559a3e 100644 --- a/frontend/dn42.go +++ b/frontend/dn42.go @@ -14,7 +14,7 @@ func dn42WhoisFilter(whois string) string { filteredPrefix := []string{ "descr:", "remarks:", "ds-rdata:", "auth:", "country:", "nserver:", "status:", "pgp-fingerprint:", "mp-import:", "mp-export:", - "members:", "key:", "inetnum:", "inet6num:", "%", + "members:", "key:", "inetnum:", "inet6num:", } for _, s := range strings.Split(whois, "\n") { if len(s) == 0 { diff --git a/frontend/telegram_bot.go b/frontend/telegram_bot.go index 0a0ac70..d53e25c 100644 --- a/frontend/telegram_bot.go +++ b/frontend/telegram_bot.go @@ -3,6 +3,7 @@ package main import ( "encoding/json" "net/http" + "strconv" "strings" ) @@ -113,6 +114,15 @@ func webHandlerTelegramBot(w http.ResponseWriter, r *http.Request) { }) } else if telegramIsCommand(request.Message.Text, "whois") { + if setting.netSpecificMode == "dn42" { + targetNumber, err := strconv.Atoi(target) + if err == nil { + if targetNumber < 10000 { + targetNumber += 4242420000 + target = strconv.Itoa(targetNumber) + } + } + } tempResult := whois(target) if setting.netSpecificMode == "dn42" { commandResult = dn42WhoisFilter(tempResult) diff --git a/proxy/Dockerfile.amd64 b/proxy/Dockerfile.amd64 index c566c25..3c13b08 100644 --- a/proxy/Dockerfile.amd64 +++ b/proxy/Dockerfile.amd64 @@ -4,7 +4,7 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=amd64 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales busybox \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ diff --git a/proxy/Dockerfile.arm32v7 b/proxy/Dockerfile.arm32v7 index e73881b..0c8643b 100644 --- a/proxy/Dockerfile.arm32v7 +++ b/proxy/Dockerfile.arm32v7 @@ -4,7 +4,7 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=arm WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales busybox \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ diff --git a/proxy/Dockerfile.arm64v8 b/proxy/Dockerfile.arm64v8 index 8bed5e6..0e46d53 100644 --- a/proxy/Dockerfile.arm64v8 +++ b/proxy/Dockerfile.arm64v8 @@ -4,7 +4,7 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=arm64 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales busybox \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \ diff --git a/proxy/Dockerfile.i386 b/proxy/Dockerfile.i386 index 7496d3e..db5dc10 100644 --- a/proxy/Dockerfile.i386 +++ b/proxy/Dockerfile.i386 @@ -4,7 +4,7 @@ LABEL Lan Tian "lantian@lantian.pub" ENV GOOS=linux GOARCH=386 WORKDIR /root COPY . . -RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales \ +RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y golang traceroute locales busybox \ && cd /root && go build -o /proxy \ && cd / && rm -rf /root/* \ && printf "en_US.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n" > /etc/locale.gen \