ProjectSegfault/Segfautils
Archived
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less hardcoding

Browse Source 
Signed-off-by: Odyssey346 <odyssey346@disroot.org>
This commit is contained in:
Odyssey346 2022-07-27 20:07:18 +02:00
parent cdd7bfbea7
commit 9bd3f8333a
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/form.go
View File

@ -17,6 +17,7 @@ import (
var ( var (
siteKey = os.Getenv("HCAPTCHA_SITE_KEY") siteKey = os.Getenv("HCAPTCHA_SITE_KEY")
secretKey = os.Getenv("HCAPTCHA_SECRET_KEY") secretKey = os.Getenv("HCAPTCHA_SECRET_KEY")
webhookURL = os.Getenv("SEGFAUTILITIES_WEBHOOK_URL")
) )
var ( var (
@ -39,27 +40,26 @@ func theActualFormCode(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusUnauthorized) w.WriteHeader(http.StatusUnauthorized)
fmt.Fprint(w, "Seems like captcha failed, you didn't complete the captcha or you are a bot. Please try again.\nPlease note that your IP has been logged in our systems for manual review to check if you're an abusive user. If you're seen as abusive, you will be blacklisted.") fmt.Fprint(w, "Seems like captcha failed, you didn't complete the captcha or you are a bot. Please try again.\nPlease note that your IP has been logged in our systems for manual review to check if you're an abusive user. If you're seen as abusive, you will be blacklisted.")
postData := url.Values{ postData := url.Values{
"content": {"IP " + r.RemoteAddr + "failed captcha!"}, "content": {"IP " + r.RemoteAddr + "failed captcha! [AbuseIPDB](https://abuseipdb.com/check/" + r.RemoteAddr},
} }
req, err := http.PostForm("https://canary.discord.com/api/webhooks/1001546472971587674/XpxdpvlrEvEo7jnRmWyrEudTW0eNC_LpNVd-uC20R44e_efgwvhzSNQ26IaGeO9yan6f", postData) req, err := http.PostForm(webhookURL, postData)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("Something went terribly wrong!", err)
} }
fmt.Fprint(io.Discard, req) // I don't want the result of the request in stdout fmt.Fprint(io.Discard, req) // I don't want the result of the request in stdout
return } else {
}
log.Printf(r.FormValue("aisdjaoidjoiajsidaoj"))
fmt.Fprintf(w, "Thanks for your message, and thanks for doing the captcha!\n%#+v", hcaptchaResp) fmt.Fprintf(w, "Thanks for your message, and thanks for doing the captcha!\n%#+v", hcaptchaResp)
postData := url.Values{ postData := url.Values{
"content": {"IP " + r.RemoteAddr + "\nFrom " + r.FormValue("email") + " with feedback type " + r.FormValue("commentType") + ":\n" + "**" + r.FormValue("message") + "**"}, "content": {"IP " + r.RemoteAddr + "\nFrom " + r.FormValue("email") + " with feedback type " + r.FormValue("commentType") + ":\n" + "**" + r.FormValue("message") + "**"},
} }
req, err := http.PostForm("https://discord.com/api/webhooks/1001546472971587674/XpxdpvlrEvEo7jnRmWyrEudTW0eNC_LpNVd-uC20R44e_efgwvhzSNQ26IaGeO9yan6f", postData) req, err := http.PostForm(webhookURL, postData)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("Something went terribly wrong!", err)
} }
fmt.Fprint(io.Discard, req) // Out with your request! I don't want it. fmt.Fprint(io.Discard, req) // Out with your request! I don't want it.
}
default: default:
http.Error(w, "Method isn't allowed!\nYou may only POST here, not " + r.Method, http.StatusMethodNotAllowed) http.Error(w, "Method isn't allowed!\nYou may only POST here, not " + r.Method, http.StatusMethodNotAllowed)
} }

6
otherthings/checkenv.go
View File

@ -30,5 +30,11 @@ func CheckEnv() {
} else { } else {
log.Println("[Segfautilities] Environment variable HCAPTCHA_SECRET_KEY is set!") log.Println("[Segfautilities] Environment variable HCAPTCHA_SECRET_KEY is set!")
} }
unused, ok1 = os.LookupEnv("SEGFAUTILITIES_WEBHOOK_URL")
if !ok1 {
log.Fatal("[Segfautilities] Environment variable SEGFAUTILITIES_WEBHOOK_URL is not set! Please set it to your webhook URL. If that URL doesn't work, make an issue on GitHub!")
} else {
log.Println("[Segfautilities] Environment variable SEGFAUTILITIES_WEBHOOK_URL is set!")
}
log.Println("[Segfautilities] ✅ Passed the Environment Variables check") log.Println("[Segfautilities] ✅ Passed the Environment Variables check")
} }