From c46d7c106f2061150b12f3e4ad13b59edffa87f3 Mon Sep 17 00:00:00 2001 From: Dipun Mistry Date: Mon, 5 Sep 2022 01:06:41 +0100 Subject: [PATCH] Added support for TOR addresses --- createboltcard/main.go | 9 ++++++++- lnurlw_request.go | 9 +++++++-- new_card_request.go | 3 +-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/createboltcard/main.go b/createboltcard/main.go index b32fa26..9c605a9 100644 --- a/createboltcard/main.go +++ b/createboltcard/main.go @@ -8,6 +8,7 @@ import ( log "github.com/sirupsen/logrus" qrcode "github.com/skip2/go-qrcode" "os" + "strings" ) func random_hex() string { @@ -69,7 +70,13 @@ func main() { // show a QR code on the console for the URI + one_time_code hostdomain := os.Getenv("HOST_DOMAIN") - url := "https://" + hostdomain + "/new?a=" + one_time_code + url := "" + if strings.HasSuffix(hostdomain, ".onion") { + url = "http://" + hostdomain + "/new?a=" + one_time_code + } else { + url = "https://" + hostdomain + "/new?a=" + one_time_code + } + fmt.Println() fmt.Println(url) fmt.Println() diff --git a/lnurlw_request.go b/lnurlw_request.go index aebe6a5..853cdac 100644 --- a/lnurlw_request.go +++ b/lnurlw_request.go @@ -8,6 +8,7 @@ import ( "net/http" "os" "strconv" + "strings" ) type Response struct { @@ -271,8 +272,12 @@ func lnurlw_response(w http.ResponseWriter, req *http.Request) { return } - host_domain := os.Getenv("HOST_DOMAIN") - lnurlw_cb_url := "https://" + host_domain + "/cb" + lnurlw_cb_url := "" + if strings.HasSuffix(req.Host, ".onion") { + lnurlw_cb_url = "http://" + req.Host + "/cb" + } else { + lnurlw_cb_url = "https://" + req.Host + "/cb" + } min_withdraw_sats_str := os.Getenv("MIN_WITHDRAW_SATS") min_withdraw_sats, err := strconv.Atoi(min_withdraw_sats_str) diff --git a/new_card_request.go b/new_card_request.go index ec11b01..8b71fcd 100644 --- a/new_card_request.go +++ b/new_card_request.go @@ -52,8 +52,7 @@ func new_card_request(w http.ResponseWriter, req *http.Request) { a := params_a[0] - host_domain := os.Getenv("HOST_DOMAIN") - lnurlw_base := "lnurlw://" + host_domain + "/ln" + lnurlw_base := "lnurlw://" + req.Host + "/ln" c, err := db_get_new_card(a)