Merge branch 'devel'

cmd/backend/config.go

@@ -14,6 +14,7 @@ type Config struct {
 	DBName      string
 	Description string
 	Domain      string
+	FirebaseKey string
 	KeyFile     string
 	Link        string
 	LogFile     string
@@ -27,13 +28,14 @@ type Config struct {
 
 func newConfig() *Config {
 	return &Config{
-		DBName:  "cpolis",
-		KeyFile: "/var/www/cpolis/cpolis.key",
-		LogFile: "/var/log/cpolis.log",
-		PDFDir:  "/var/www/cpolis/pdfs",
-		PicsDir: "/var/www/cpolis/pics",
-		RSSFile: "/var/www/cpolis/cpolis.rss",
-		WebDir:  "/var/www/cpolis/web",
+		DBName:      "cpolis",
+		FirebaseKey: "/var/www/cpolis/serviceAccountKey.json",
+		KeyFile:     "/var/www/cpolis/cpolis.key",
+		LogFile:     "/var/log/cpolis.log",
+		PDFDir:      "/var/www/cpolis/pdfs",
+		PicsDir:     "/var/www/cpolis/pics",
+		RSSFile:     "/var/www/cpolis/cpolis.rss",
+		WebDir:      "/var/www/cpolis/web",
 	}
 }
 
@@ -76,19 +78,25 @@ func (c *Config) handleCliArgs() error {
 	port := 8080
 
 	flag.StringVar(&c.DBName, "db", c.DBName, "DB name")
-	flag.StringVar(&c.Description, "desc", c.Description, "Channel description")
+	flag.StringVar(&c.Description, "desc", c.Description, "channel description")
 	flag.StringVar(&c.Domain, "domain", c.Domain, "domain name")
+	flag.StringVar(&c.FirebaseKey, "firebase", c.FirebaseKey, "Firebase service account key file")
 	flag.StringVar(&c.KeyFile, "key", c.KeyFile, "key file")
-	flag.StringVar(&c.Link, "link", c.Link, "Channel Link")
+	flag.StringVar(&c.Link, "link", c.Link, "channel Link")
 	flag.StringVar(&c.LogFile, "log", c.LogFile, "log file")
 	flag.StringVar(&c.PDFDir, "pdfs", c.PDFDir, "pdf directory")
 	flag.StringVar(&c.PicsDir, "pics", c.PicsDir, "pictures directory")
 	flag.StringVar(&c.RSSFile, "rss", c.RSSFile, "RSS file")
-	flag.StringVar(&c.Title, "title", c.Title, "Channel title")
+	flag.StringVar(&c.Title, "title", c.Title, "channel title")
 	flag.StringVar(&c.WebDir, "web", c.WebDir, "web directory")
 	flag.IntVar(&port, "port", port, "port")
 	flag.Parse()
 
+	c.FirebaseKey, err = filepath.Abs(c.FirebaseKey)
+	if err != nil {
+		return fmt.Errorf("error finding absolute path for Firebase service account key file: %v", err)
+	}
+
 	c.KeyFile, err = filepath.Abs(c.KeyFile)
 	if err != nil {
 		return fmt.Errorf("error finding absolute path for key file: %v", err)

cmd/backend/firebase.go

@@ -12,12 +12,12 @@ type Client struct {
 	*auth.Client
 }
 
-func NewClient() (*Client, error) {
+func NewClient(c *Config) (*Client, error) {
 	var err error
 	client := new(Client)
 
 	ctx := context.Background()
-	opt := option.WithCredentialsFile("path/to/serviceAccountKey.json")
+	opt := option.WithCredentialsFile(c.FirebaseKey)
 
 	app, err := firebase.NewApp(ctx, nil, opt)
 	if err != nil {

cmd/calls/pdf.go

@@ -0,0 +1,44 @@
+package calls
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+
+	b "streifling.com/jason/cpolis/cmd/backend"
+)
+
+func ServePDFList(c *b.Config) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if tokenIsVerified(w, r, c) {
+			files, err := os.ReadDir(c.PDFDir)
+			if err != nil {
+				log.Println(err)
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+
+			fileNames := make([]string, 0)
+			for _, file := range files {
+				fileNames = append(fileNames, file.Name())
+			}
+
+			w.Header().Set("Content-Type", "application/json")
+			if err = json.NewEncoder(w).Encode(fileNames); err != nil {
+				log.Println(err)
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
+		}
+	}
+}
+
+func ServePDF(c *b.Config) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if tokenIsVerified(w, r, c) {
+			http.ServeFile(w, r, fmt.Sprint(c.PDFDir, "/", r.PathValue("id")))
+		}
+	}
+}

cmd/calls/rss.go

@@ -0,0 +1,15 @@
+package calls
+
+import (
+	"net/http"
+
+	b "streifling.com/jason/cpolis/cmd/backend"
+)
+
+func ServeRSS(c *b.Config) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if tokenIsVerified(w, r, c) {
+			http.ServeFile(w, r, c.RSSFile)
+		}
+	}
+}

cmd/calls/verification.go

@@ -0,0 +1,34 @@
+package calls
+
+import (
+	"log"
+	"net/http"
+
+	b "streifling.com/jason/cpolis/cmd/backend"
+)
+
+// tokenIsVerified verifies that a request is authorized. It returns a bool.
+func tokenIsVerified(w http.ResponseWriter, r *http.Request, c *b.Config) bool {
+	idToken := r.Header.Get("Authorization")
+	if idToken == "" {
+		log.Println("Authorization header missing")
+		http.Error(w, "Authorization header missing", http.StatusUnauthorized)
+		return false
+	}
+
+	client, err := b.NewClient(c)
+	if err != nil {
+		log.Println(err)
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return false
+	}
+
+	_, err = client.Verify(idToken)
+	if err != nil {
+		log.Println(err)
+		http.Error(w, err.Error(), http.StatusUnauthorized)
+		return false
+	}
+
+	return true
+}

cmd/frontend/articles.go

@@ -23,29 +23,13 @@ const (
 	PreviewMode
 )
 
-func ShowHub(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
+func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := s.Get(r, "cookie")
+		session, err := getSession(w, r, c, s)
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
-		session.Values["article"] = nil
-		if err = session.Save(r, w); err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
-		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", session.Values["role"].(int))
-	}
-}
-
-func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
 		type editorHTMLData struct {
 			Title       string
 			Description string
@@ -55,13 +39,6 @@ func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			Mode        int
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		var data editorHTMLData
 		if session.Values["article"] == nil {
 			data = editorHTMLData{}
@@ -84,11 +61,9 @@ func WriteArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := s.Get(r, "cookie")
+		session, err := getSession(w, r, c, s)
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
+			return
 		}
 
 		session.Values["article"] = nil
@@ -139,6 +114,11 @@ func SubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
@@ -178,21 +158,18 @@ func ResubmitArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])
 	}
 }
 
-func ShowUnpublishedArticles(c *b.Config, db *b.DB) http.HandlerFunc {
+func ShowUnpublishedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		unpublishedArticles, err := db.GetCertainArticles(false, false)
 		if err != nil {
 			log.Println(err)
@@ -208,19 +185,17 @@ func ShowUnpublishedArticles(c *b.Config, db *b.DB) http.HandlerFunc {
 
 func ShowRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		type htmlData struct {
 			MyIDs            map[int64]bool
 			RejectedArticles []*b.Article
 		}
 		data := new(htmlData)
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
 		data.RejectedArticles, err = db.GetCertainArticles(false, true)
 		if err != nil {
 			log.Println(err)
@@ -243,6 +218,10 @@ func ShowRejectedArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerF
 
 func ReviewUnpublishedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		type htmlData struct {
 			Title       string
 			Description string
@@ -305,6 +284,10 @@ func ReviewUnpublishedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Hand
 
 func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		type htmlData struct {
 			Selected map[int64]bool
 			Article  *b.Article
@@ -352,6 +335,11 @@ func ReviewRejectedArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.Handler
 
 func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
@@ -359,13 +347,6 @@ func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		if err = db.AddArticleToCurrentIssue(id); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -402,6 +383,11 @@ func PublishArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
@@ -409,13 +395,6 @@ func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		if err = db.UpdateAttributes(
 			&b.Attribute{Table: "articles", ID: id, AttName: "rejected", Value: true},
 		); err != nil {
@@ -430,8 +409,12 @@ func RejectArticle(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	}
 }
 
-func ShowCurrentArticles(c *b.Config, db *b.DB) http.HandlerFunc {
+func ShowCurrentArticles(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		articles, err := db.GetCurrentIssueArticles()
 		if err != nil {
 			log.Println(err)
@@ -444,8 +427,12 @@ func ShowCurrentArticles(c *b.Config, db *b.DB) http.HandlerFunc {
 	}
 }
 
-func UploadImage(c *b.Config) http.HandlerFunc {
+func UploadImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		file, header, err := r.FormFile("article-image")
 		if err != nil {
 			log.Println(err)

cmd/frontend/editor.go

@@ -7,8 +7,12 @@ import (
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
 
-func CreateTag(c *b.Config) http.HandlerFunc {
+func CreateTag(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-tag.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 	}
@@ -16,15 +20,13 @@ func CreateTag(c *b.Config) http.HandlerFunc {
 
 func AddTag(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		db.AddTag(r.PostFormValue("tag"))
-
-		session, err := s.Get(r, "cookie")
+		session, err := getSession(w, r, c, s)
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
+			return
 		}
 
+		db.AddTag(r.PostFormValue("tag"))
+
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])

cmd/frontend/firebase.go

@@ -1,74 +0,0 @@
-package frontend
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-
-	b "streifling.com/jason/cpolis/cmd/backend"
-)
-
-func tokenIsVerified(w http.ResponseWriter, r *http.Request) bool {
-	idToken := r.Header.Get("Authorization")
-	if idToken == "" {
-		log.Println("Authorization header missing")
-		http.Error(w, "Authorization header missing", http.StatusUnauthorized)
-		return false
-	}
-
-	client, err := b.NewClient()
-	if err != nil {
-		log.Println(err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return false
-	}
-
-	_, err = client.Verify(idToken)
-	if err != nil {
-		log.Println(err)
-		http.Error(w, err.Error(), http.StatusUnauthorized)
-		return false
-	}
-
-	return true
-}
-
-func ServePDFList(c *b.Config) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		if tokenIsVerified(w, r) {
-			files, err := os.ReadDir(c.PDFDir)
-			if err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-			fileNames := make([]string, 0)
-			for _, file := range files {
-				fileNames = append(fileNames, file.Name())
-			}
-
-			w.Header().Set("Content-Type", "application/json")
-			if err = json.NewEncoder(w).Encode(fileNames); err != nil {
-				log.Println(err)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-		}
-	}
-}
-
-func ServePDFs(c *b.Config) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		if tokenIsVerified(w, r) {
-			pdfIDsString := r.PathValue("ids")
-			pdfIDs := strings.Split(pdfIDsString, ",")
-
-			for _, id := range pdfIDs {
-				http.ServeFile(w, r, id)
-			}
-		}
-	}
-}

cmd/frontend/images.go

@@ -10,6 +10,10 @@ import (
 
 func ServeImage(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		absFilepath, err := filepath.Abs(c.PicsDir)
 		if err != nil {
 			log.Println(err)

cmd/frontend/issues.go

@@ -10,19 +10,17 @@ import (
 
 func PublishLatestIssue(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		if err := db.PublishLatestIssue(); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"])

cmd/frontend/sessions.go

@@ -90,11 +90,9 @@ func Login(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func Logout(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := s.Get(r, "cookie")
+		session, err := getSession(w, r, c, s)
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
+			return
 		}
 
 		session.Options.MaxAge = -1
@@ -109,3 +107,22 @@ func Logout(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 	}
 }
+
+func ShowHub(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
+		session.Values["article"] = nil
+		if err = session.Save(r, w); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
+		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", session.Values["role"].(int))
+	}
+}

cmd/frontend/users.go

@@ -30,8 +30,12 @@ func checkUserStrings(user *b.User) (string, int, bool) {
 	}
 }
 
-func CreateUser(c *b.Config) http.HandlerFunc {
+func CreateUser(c *b.Config, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/add-user.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", nil)
 	}
@@ -39,6 +43,11 @@ func CreateUser(c *b.Config) http.HandlerFunc {
 
 func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		role, err := strconv.Atoi(r.PostFormValue("role"))
 		if err != nil {
 			log.Println(err)
@@ -94,13 +103,6 @@ func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"].(int))
@@ -109,11 +111,9 @@ func AddUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func EditSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := s.Get(r, "cookie")
+		session, err := getSession(w, r, c, s)
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
+			return
 		}
 
 		user, err := db.GetUser(session.Values["id"].(int64))
@@ -130,11 +130,9 @@ func EditSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func UpdateSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session, err := s.Get(r, "cookie")
+		session, err := getSession(w, r, c, s)
 		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
+			return
 		}
 
 		userData := UserData{
@@ -200,8 +198,11 @@ func UpdateSelf(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func AddFirstUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var err error
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
 
+		var err error
 		htmlData := UserData{
 			User: &b.User{
 				UserName:  r.PostFormValue("username"),
@@ -275,7 +276,11 @@ func AddFirstUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func ShowAllUsers(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var err error
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		type htmlData struct {
 			Users  map[int64]*b.User
 			Action string
@@ -289,21 +294,18 @@ func ShowAllUsers(c *b.Config, db *b.DB, s *b.CookieStore, action string) http.H
 			return
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		delete(data.Users, session.Values["id"].(int64))
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/show-all-users.html")
 		template.Must(tmpl, err).ExecuteTemplate(w, "page-content", data)
 	}
 }
 
-func EditUser(c *b.Config, db *b.DB) http.HandlerFunc {
+func EditUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if _, err := getSession(w, r, c, s); err != nil {
+			return
+		}
+
 		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
@@ -325,6 +327,11 @@ func EditUser(c *b.Config, db *b.DB) http.HandlerFunc {
 
 func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
@@ -394,13 +401,6 @@ func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", userData)
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"].(int))
@@ -409,6 +409,11 @@ func UpdateUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 
 func DeleteUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		session, err := getSession(w, r, c, s)
+		if err != nil {
+			return
+		}
+
 		id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
 		if err != nil {
 			log.Println(err)
@@ -422,13 +427,6 @@ func DeleteUser(c *b.Config, db *b.DB, s *b.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		session, err := s.Get(r, "cookie")
-		if err != nil {
-			tmpl, err := template.ParseFiles(c.WebDir + "/templates/login.html")
-			msg := "Session nicht mehr gültig. Bitte erneut anmelden."
-			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
-		}
-
 		tmpl, err := template.ParseFiles(c.WebDir + "/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
 		tmpl.ExecuteTemplate(w, "page-content", session.Values["role"].(int))

cmd/frontend/verification.go

@@ -0,0 +1,29 @@
+package frontend
+
+import (
+	"errors"
+	"html/template"
+	"net/http"
+
+	"github.com/gorilla/sessions"
+	b "streifling.com/jason/cpolis/cmd/backend"
+)
+
+// getSession is used for verifying that the user is logged in and returns their session and an error.
+func getSession(w http.ResponseWriter, r *http.Request, c *b.Config, s *b.CookieStore) (*sessions.Session, error) {
+	msg := "Keine gültige Session. Bitte erneut anmelden."
+	tmpl, tmplErr := template.ParseFiles(c.WebDir+"/templates/index.html", c.WebDir+"/templates/login.html")
+
+	session, err := s.Get(r, "cookie")
+	if err != nil {
+		template.Must(tmpl, tmplErr).ExecuteTemplate(w, "page-content", msg)
+		return nil, err
+	}
+
+	if session.IsNew {
+		template.Must(tmpl, tmplErr).ExecuteTemplate(w, "page-content", msg)
+		return session, errors.New("error: no existing session")
+	}
+
+	return session, nil
+}

cmd/main.go

@@ -7,6 +7,7 @@ import (
 	"os"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
+	c "streifling.com/jason/cpolis/cmd/calls"
 	f "streifling.com/jason/cpolis/cmd/frontend"
 )
 
@@ -48,13 +49,15 @@ func main() {
 		http.FileServer(http.Dir(config.WebDir+"/static/"))))
 	mux.HandleFunc("/", f.HomePage(config, db, store))
 
-	mux.HandleFunc("GET /create-tag", f.CreateTag(config))
-	mux.HandleFunc("GET /create-user", f.CreateUser(config))
+	mux.HandleFunc("GET /create-tag", f.CreateTag(config, store))
+	mux.HandleFunc("GET /create-user", f.CreateUser(config, store))
 	mux.HandleFunc("GET /edit-self", f.EditSelf(config, db, store))
-	mux.HandleFunc("GET /edit-user/{id}", f.EditUser(config, db))
+	mux.HandleFunc("GET /edit-user/{id}", f.EditUser(config, db, store))
 	mux.HandleFunc("GET /delete-user/{id}", f.DeleteUser(config, db, store))
 	mux.HandleFunc("GET /hub", f.ShowHub(config, db, store))
 	mux.HandleFunc("GET /logout", f.Logout(config, store))
+	mux.HandleFunc("GET /pdf/get-list", c.ServePDFList(config))
+	mux.HandleFunc("GET /pdf/{id}", c.ServePDF(config))
 	mux.HandleFunc("GET /pics/{pic}", f.ServeImage(config, store))
 	mux.HandleFunc("GET /publish-article/{id}", f.PublishArticle(config, db, store))
 	mux.HandleFunc("GET /publish-issue", f.PublishLatestIssue(config, db, store))
@@ -62,11 +65,11 @@ func main() {
 	mux.HandleFunc("GET /rejected-articles", f.ShowRejectedArticles(config, db, store))
 	mux.HandleFunc("GET /review-rejected-article/{id}", f.ReviewRejectedArticle(config, db, store))
 	mux.HandleFunc("GET /review-unpublished-article/{id}", f.ReviewUnpublishedArticle(config, db, store))
-	mux.HandleFunc("GET /rss", func(w http.ResponseWriter, r *http.Request) { http.ServeFile(w, r, config.RSSFile) })
+	mux.HandleFunc("GET /rss", c.ServeRSS(config))
 	mux.HandleFunc("GET /show-all-users-edit", f.ShowAllUsers(config, db, store, "edit-user"))
 	mux.HandleFunc("GET /show-all-users-delete", f.ShowAllUsers(config, db, store, "delete-user"))
-	mux.HandleFunc("GET /this-issue", f.ShowCurrentArticles(config, db))
-	mux.HandleFunc("GET /unpublished-articles", f.ShowUnpublishedArticles(config, db))
+	mux.HandleFunc("GET /this-issue", f.ShowCurrentArticles(config, db, store))
+	mux.HandleFunc("GET /unpublished-articles", f.ShowUnpublishedArticles(config, db, store))
 	mux.HandleFunc("GET /write-article", f.WriteArticle(config, db, store))
 
 	mux.HandleFunc("POST /add-first-user", f.AddFirstUser(config, db, store))
@@ -77,7 +80,7 @@ func main() {
 	mux.HandleFunc("POST /submit-article", f.SubmitArticle(config, db, store))
 	mux.HandleFunc("POST /update-self", f.UpdateSelf(config, db, store))
 	mux.HandleFunc("POST /update-user/{id}", f.UpdateUser(config, db, store))
-	mux.HandleFunc("POST /upload-image", f.UploadImage(config))
+	mux.HandleFunc("POST /upload-image", f.UploadImage(config, store))
 
 	log.Fatalln(http.ListenAndServe(config.Port, mux))
 }

cpolis.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=cpolis
+
+[Service]
+ExecStart=/usr/local/bin/cpolis
+Restart=on-failure
+
+[Install]
+WantedBy=default.target

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/yuin/goldmark v1.7.0
 	golang.org/x/crypto v0.21.0
 	golang.org/x/term v0.18.0
+	google.golang.org/api v0.170.0
 )
 
 require (
@@ -48,7 +49,6 @@ require (
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/api v0.170.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/appengine/v2 v2.0.2 // indirect
 	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect

update.sh

@@ -0,0 +1,56 @@
+#! /bin/sh -
+
+CPOLIS_REPO_URL="https://git.streifling.com/api/v1/repos/jason/cpolis/releases"
+EXTRACTION_DIR=$HOME
+CPOLIS_DIR=$EXTRACTION_DIR/cpolis
+TAILWINDCSS_REPO_URL=https://api.github.com/repos/tailwindlabs/tailwindcss/releases/latest
+TMP_DIR=/tmp
+BIN_DIR=/usr/local/bin
+SYSTEMD_DIR=/etc/systemd/system
+
+check_dependency() {
+    if ! which $1 >/dev/null 2>&1; then
+        echo "$1 needs to be installed" >&2
+        exit 1
+    fi
+}
+
+if ! groups | grep -E 'root|wheel|sudo' >/dev/null; then
+    echo "You need administrative privileges for this script" >&2
+    exit 1
+fi
+
+check_dependency curl
+check_dependency go
+check_dependency jq
+check_dependency tar
+check_dependency xargs
+
+echo '\nDownloading cpolis...' >&2
+rm -fr $CPOLIS_DIR/*
+latest_release=$(curl -s $CPOLIS_REPO_URL | jq -r '.[0].tag_name')
+curl -Lo $TMP_DIR/cpolis.tar.gz https://git.streifling.com/jason/cpolis/archive/$latest_release.tar.gz
+tar -xzf $TMP_DIR/cpolis.tar.gz -C $EXTRACTION_DIR
+rm $TMP_DIR/cpolis.tar.gz
+
+echo '\nDownloading TailwindCSS...' >&2
+curl -s $TAILWINDCSS_REPO_URL |
+    grep -F browser_download_url |
+    grep -F linux-x64 |
+    cut -d'"' -f4 |
+    xargs -r curl -Lo $CPOLIS_DIR/tailwindcss
+chmod +x $CPOLIS_DIR/tailwindcss
+$CPOLIS_DIR/tailwindcss -i $CPOLIS_DIR/web/static/css/input.css -o $CPOLIS_DIR/web/static/css/style.css
+
+echo '\nBuilding cpolis...' >&2
+go build -o $TMP_DIR/cpolis $CPOLIS_DIR/cmd/main.go
+
+echo '\nSetting system files up...' >&2
+sudo mv $TMP_DIR/cpolis $BIN_DIR/cpolis
+sudo chown root:root $BIN_DIR/cpolis
+chmod +x $BIN_DIR/cpolis
+
+sudo mv $CPOLIS_DIR/cpolis.service $SYSTEMD_DIR
+sudo chown root:root $SYSTEMD_DIR/cpolis.service
+sudo systemctl daemon-reload
+sudo systemctl is-active --quiet cpolis.service && sudo systemctl restart cpolis.service