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

@@ -12,7 +12,7 @@ import (
 
 func ServePDFList(c *b.Config) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if tokenIsVerified(w, r) {
+		if tokenIsVerified(w, r, c) {
 			files, err := os.ReadDir(c.PDFDir)
 			if err != nil {
 				log.Println(err)
@@ -37,7 +37,7 @@ func ServePDFList(c *b.Config) http.HandlerFunc {
 
 func ServePDF(c *b.Config) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if tokenIsVerified(w, r) {
+		if tokenIsVerified(w, r, c) {
 			http.ServeFile(w, r, fmt.Sprint(c.PDFDir, "/", r.PathValue("id")))
 		}
 	}

cmd/calls/rss.go

@@ -8,7 +8,7 @@ import (
 
 func ServeRSS(c *b.Config) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		if tokenIsVerified(w, r) {
+		if tokenIsVerified(w, r, c) {
 			http.ServeFile(w, r, c.RSSFile)
 		}
 	}

cmd/calls/verification.go

@@ -8,7 +8,7 @@ import (
 )
 
 // tokenIsVerified verifies that a request is authorized. It returns a bool.
-func tokenIsVerified(w http.ResponseWriter, r *http.Request) 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")
@@ -16,7 +16,7 @@ func tokenIsVerified(w http.ResponseWriter, r *http.Request) bool {
 		return false
 	}
 
-	client, err := b.NewClient()
+	client, err := b.NewClient(c)
 	if err != nil {
 		log.Println(err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)

update.sh

@@ -6,37 +6,51 @@ 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
 
-! groups | grep -E 'root|wheel|sudo' >/dev/null && echo "You need administrative privileges for this script" && exit 1
+check_dependency() {
+    if ! which $1 >/dev/null 2>&1; then
+        echo "$1 needs to be installed" >&2
+        exit 1
+    fi
+}
 
-! which curl >/dev/null 2>&1 && echo "curl needs to be installed" >&2 && exit 1
-! which go >/dev/null 2>&1 && echo "go needs to be installed" >&2 && exit 1
-! which jq >/dev/null 2>&1 && echo "jq needs to be installed" >&2 && exit 1
-! which tar >/dev/null 2>&1 && echo "tar needs to be installed" >&2 && exit 1
-! which xargs >/dev/null 2>&1 && echo "xargs needs to be installed" >&2 && exit 1
+if ! groups | grep -E 'root|wheel|sudo' >/dev/null; then
+    echo "You need administrative privileges for this script" >&2
+    exit 1
+fi
 
-echo -e '\nDownloading cpolis...'
+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 -e '\nDownloading TailwindCSS...'
+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 web/static/css/input.css -o web/static/css/style.css
+$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 -e 'Setting system files up'
+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 /etc/systemd/system
+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