From 3b9dfe2c2219440af2073072e6b680668b968bb1 Mon Sep 17 00:00:00 2001
From: Rutger Broekhoff
Date: Wed, 19 Mar 2025 21:44:58 +0100
Subject: Make User-Agent configurable

---
 config.go          |  2 ++
 icalproxy.go       | 37 ++++++++++++++++++++++++++-----------
 module/default.nix |  4 ++++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/config.go b/config.go
index 3ddf42a..0b09061 100644
--- a/config.go
+++ b/config.go
@@ -33,6 +33,7 @@ type config struct {
 	Ignore      ignoreRules          `json:"ignore"`
 	Port        string               `json:"port"`
 	UserTokens  map[string]userToken `json:"user_tokens"`
+	UserAgent   string               `json:"user_agent"`
 }
 
 type ignoreRules struct {
@@ -46,6 +47,7 @@ func printConfig(cfg *config) {
 	log.Print("Loaded configuration: ")
 	log.Print("  Calendar URL:  ", cfg.CalendarURL.v.String())
 	log.Print("  HTTP Port:     ", cfg.Port)
+	log.Print("  User Agent:    ", cfg.UserAgent)
 	log.Print("  Ignoring:")
 	for _, entry := range cfg.Ignore.LocationRegexes {
 		log.Printf("    Events with locations matching %s", entry.String())
diff --git a/icalproxy.go b/icalproxy.go
index 77ced94..5f775ba 100644
--- a/icalproxy.go
+++ b/icalproxy.go
@@ -22,10 +22,11 @@ func main() {
 	}
 
 	handler := handler{
-		calURL: url.URL(cfg.CalendarURL.v),
-		ignore: cfg.Ignore,
-		tokens: cfg.UserTokens,
-		amsTz:  amsTz,
+		calURL:    url.URL(cfg.CalendarURL.v),
+		ignore:    cfg.Ignore,
+		tokens:    cfg.UserTokens,
+		amsTz:     amsTz,
+		userAgent: cfg.UserAgent,
 	}
 
 	mux := http.ServeMux{}
@@ -44,10 +45,11 @@ func main() {
 }
 
 type handler struct {
-	ignore ignoreRules
-	tokens map[string]userToken
-	calURL url.URL
-	amsTz  *time.Location
+	ignore    ignoreRules
+	tokens    map[string]userToken
+	calURL    url.URL
+	amsTz     *time.Location
+	userAgent string
 }
 
 func (h handler) makeTokenURL(token string) string {
@@ -63,13 +65,26 @@ func (h handler) handle(w http.ResponseWriter, r *http.Request) {
 	proxyUserID := r.URL.Query().Get("proxy_user_id")
 	proxyToken := r.URL.Query().Get("proxy_token")
 	if !userOK(h.tokens, proxyUserID, []byte(proxyToken)) {
-		http.Error(w, "Bad proxy_user_id or proxy_token", http.StatusUnauthorized)
+		http.Error(w, "Bad proxy_user_id or proxy_token",
+			http.StatusUnauthorized)
 		return
 	}
 
-	resp, err := http.Get(h.makeTokenURL(brightspaceToken))
+	req, err := http.NewRequestWithContext(r.Context(), http.MethodGet,
+		h.makeTokenURL(brightspaceToken), nil)
 	if err != nil {
-		http.Error(w, "Error sending request to Brightspace", http.StatusInternalServerError)
+		http.Error(w, "Error constructing HTTP request for Brightspace",
+			http.StatusInternalServerError)
+		return
+	}
+	if h.userAgent != "" {
+		req.Header.Add("User-Agent", h.userAgent)
+	}
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		http.Error(w, "Error sending request to Brightspace",
+			http.StatusInternalServerError)
 		return
 	}
 
diff --git a/module/default.nix b/module/default.nix
index 774a361..474187f 100644
--- a/module/default.nix
+++ b/module/default.nix
@@ -25,6 +25,9 @@ in {
     port = mkOption {
       type = str;
     };
+    userAgent = mkOption {
+      type = str;
+    };
     userTokens = mkOption {
       type = attrsOf (submodule {
         options = {
@@ -59,6 +62,7 @@ in {
             summary_regexes = cfg.ignore.summaryRegexes;
           };
           port = cfg.port;
+          user_agent = cfg.userAgent;
           user_tokens = cfg.userTokens;
         });
       };
-- 
cgit v1.2.3