Merge options-pub into oauth

.github/workflows/docker.yml

@@ -26,4 +26,4 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: projectsegfault/segfautils:latest
+          tags: realprojectsegfault/segfautils:latest

.gitignore

@@ -1 +1,2 @@
 data/config.toml
+data/announcements.json

.woodpecker.yml

@@ -12,6 +12,8 @@ pipeline:
       event: [push]
     name: dockerize and publish
     image: plugins/docker
+    registry: git.projectsegfau.lt
+    repo: git.projectsegfau.lt/projectsegfault/segfautils 
     settings:
       username:
         from_secret: username
@@ -19,6 +21,20 @@ pipeline:
         from_secret: password
       repo: projectsegfault/segfautils 
       dockerfile: Dockerfile
-
+  dockerize_dev:
+    when:
+      event: [push]
+    image: plugins/docker
+    name: dockerize and publish dev
+    registry: git.projectsegfau.lt
+    repo: git.projectsegfau.lt/projectsegfault/segfautils
+    settings:
+      username:
+        from_secret: username
+      password:
+        from_secret: password
+      repo: projectsegfau.lt/segfautils
+      tags: dev
+      dockerfile: Dockerfile
     
   

api/announcements.go

@@ -15,8 +15,30 @@ import (
 
 var (
 	authToken = config.AuthToken()
+	resAnn    = config.OptAnn()
 )
 
+func AnnCheck() {
+	if resAnn == "false" {
+		log.Println("[Segfautils] ℹ Announcements are disabled")
+		http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) {
+			http.Error(w, "Announcements are disabled.", http.StatusServiceUnavailable)
+		})
+		http.HandleFunc("/api/announcements", func(w http.ResponseWriter, r *http.Request) {
+			http.Error(w, "{\"enabled\": \"false\"}", http.StatusServiceUnavailable)
+		})
+	} else {
+		AnnPage()
+		Announcements()
+	}
+}
+
+func AnnPage() {
+	http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) {
+		http.ServeFile(w, r, "static/announcements.html")
+	})
+}
+
 func Announcements() {
 	http.HandleFunc("/api/announcements", getAnnouncements)
 	http.HandleFunc("/api/announcements/post", handleAnnouncements)
@@ -39,6 +61,7 @@ func handleAnnouncements(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusOK)
 			now := time.Now().Unix()
 			data := map[string]interface{}{
+				"enabled":  "true",
 				"title":    r.FormValue("title"),
 				"link":     r.FormValue("link"),
 				"severity": r.FormValue("severity"),

api/form.go

@@ -1,18 +1,16 @@
 package api
 
 import (
+	"fmt"
+	"io"
 	"log"
 	"net/http"
-
-	"github.com/kataras/hcaptcha"
-
-	"fmt"
-
-	"io"
 	"net/url"
+	"text/template"
 
 	"github.com/ProjectSegfault/segfautils/config"
 	"github.com/ProjectSegfault/segfautils/utils"
+	"github.com/kataras/hcaptcha"
 )
 
 var (
@@ -20,8 +18,37 @@ var (
 	secretKey  = config.HCaptchaSecretKey()
 	webhookURL = config.WebhookURL()
 	client     = hcaptcha.New(secretKey) /* See `Client.FailureHandler` too. */
+	resForm    = config.OptForm()
 )
 
+func FormCheck() {
+	if resForm == "false" {
+		log.Println("[Segfautils] ℹ Contact form is disabled")
+		http.HandleFunc("/form", func(w http.ResponseWriter, r *http.Request) {
+			http.Error(w, "Form is disabled.", http.StatusServiceUnavailable)
+		})
+	} else {
+		FormPage()
+		Form()
+	}
+}
+
+func FormPage() {
+	type StaticThing struct {
+		HCaptchaSiteKey string
+	}
+
+	tmpl_form := template.Must(template.ParseFiles("static/form.html"))
+	http.HandleFunc("/form/", func(w http.ResponseWriter, r *http.Request) {
+
+		hcaptcha_site_key := config.HCaptchaSiteKey()
+		data := StaticThing{
+			HCaptchaSiteKey: hcaptcha_site_key,
+		}
+		tmpl_form.Execute(w, data)
+	})
+}
+
 func Form() {
 	http.HandleFunc("/api/form", client.HandlerFunc(theActualFormCode))
 }

config/authtoken.go

@@ -15,7 +15,7 @@ func AuthToken() string {
 	viper.AddConfigPath("./data")
 	err := viper.ReadInConfig()
 	if err != nil {
-		log.Println("Error reading config for getting segfautils.auth_token", err.Error())
+		log.Println("Error reading config. Error getting: segfautils.auth_token", err.Error())
 	}
 	result := viper.GetString("segfautils.auth_token")
 	return result

config/hcaptchasecretkey.go

@@ -11,7 +11,7 @@ func HCaptchaSecretKey() string {
 	viper.AddConfigPath("./data")
 	err := viper.ReadInConfig()
 	if err != nil {
-		log.Println("Error reading config for getting hcaptcha.secret_key", err.Error())
+		log.Println("Error reading config. Error getting: hcaptcha.secret_key", err.Error())
 	}
 	result := viper.GetString("hcaptcha.secret_key")
 	return result

config/hcaptchasitekey.go

@@ -11,7 +11,7 @@ func HCaptchaSiteKey() string {
 	viper.AddConfigPath("./data")
 	err := viper.ReadInConfig()
 	if err != nil {
-		log.Println("Error reading config for getting hcaptcha.site_key", err.Error())
+		log.Println("Error reading config. Error getting: hcaptcha.site_key", err.Error())
 	}
 	result := viper.GetString("hcaptcha.site_key")
 	return result

config/optionannounce.go

@@ -0,0 +1,18 @@
+package config
+
+import (
+	"log"
+
+	"github.com/spf13/viper"
+)
+
+func OptAnn() string {
+	viper.SetConfigName("config")
+	viper.AddConfigPath("./data")
+	err := viper.ReadInConfig()
+	if err != nil {
+		log.Println("Error reading config. Error getting: options.announce", err.Error())
+	}
+	result := viper.GetString("options.announce")
+	return result
+}

config/optionform.go

@@ -0,0 +1,18 @@
+package config
+
+import (
+	"log"
+
+	"github.com/spf13/viper"
+)
+
+func OptForm() string {
+	viper.SetConfigName("config")
+	viper.AddConfigPath("./data")
+	err := viper.ReadInConfig()
+	if err != nil {
+		log.Println("Error reading config. Error getting: options.form", err.Error())
+	}
+	result := viper.GetString("options.form")
+	return result
+}

config/port.go

@@ -12,7 +12,7 @@ func Port() string {
 	viper.AddConfigPath("./data")
 	err := viper.ReadInConfig()
 	if err != nil {
-		log.Println("Error reading config for getting segfautils.port", err.Error())
+		log.Println("Error reading config. Error getting: segfautils.port", err.Error())
 	}
 	result := strconv.Itoa(viper.GetInt("segfautils.port"))
 	return result

config/webhook.go

@@ -11,7 +11,7 @@ func WebhookURL() string {
 	viper.AddConfigPath("./data")
 	err := viper.ReadInConfig()
 	if err != nil {
-		log.Println("Error reading config for getting segfautils.webhook_url", err.Error())
+		log.Println("Error reading config. Error getting: segfautils.webhook_url", err.Error())
 	}
 	result := viper.GetString("segfautils.webhook_url")
 	return result

data/config.example.toml

@@ -12,3 +12,7 @@ client_id = "YOURCLIENTID"
 client_secret = "YOURCLIENTSECRET"
 redirect_url = "YOURREDIRECTURL"
 auth_url = "YOURAUTHURL"
+
+[options]
+announce = true
+form     = false

main.go

@@ -13,17 +13,12 @@ import (
 
 type StaticThingy struct {
 	Port string
-	HCaptchaSiteKey string
 }
 
-var port string
-var shit bool
-
 func main() {
 	log.Println("[Segfautils] Starting")
 	utils.CheckConfig()
-	log.Println("[HTTP] Starting server")
+
-	hcaptcha_site_key := config.HCaptchaSiteKey()
 	tmpl := template.Must(template.ParseFiles("static/index.html"))
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		data := StaticThingy{
@@ -32,22 +27,14 @@ func main() {
 		tmpl.Execute(w, data)
 	})
 
-	tmpl_form := template.Must(template.ParseFiles("static/form.html"))
+	log.Println("[HTTP] Starting server")
-	http.HandleFunc("/form/", func(w http.ResponseWriter, r *http.Request) {
+	api.AnnCheck()
-		data := StaticThingy{
+	api.FormCheck()
-			HCaptchaSiteKey: hcaptcha_site_key,
-		}
-		tmpl_form.Execute(w, data)
-	})
 
 	http.HandleFunc("/api/", func(w http.ResponseWriter, r *http.Request) {
 		io.WriteString(w, "welcome to hell")
 	})
-	http.HandleFunc("/announcements", func(w http.ResponseWriter, r *http.Request) {
+
-		http.ServeFile(w, r, "static/announcements.html")
-	})
-	api.Form()
-	api.Announcements()
 	log.Println("[HTTP] HTTP server is now running at " + config.Port() + "!")
 	log.Println(http.ListenAndServe(":"+config.Port(), nil))
 }