Merge branch 'devel'

cmd/backend/articles.go

@@ -115,31 +115,6 @@ func (db *DB) GetArticle(id int64) (*Article, error) {
 	return article, nil
 }
 
-func (db *DB) GetArticleByUUID(u uuid.UUID) (*Article, error) {
-	query := `
-    SELECT id, title, created, banner_link, summary, published, creator_id, issue_id, edited_id, clicks, is_in_issue, auto_generated
-    FROM articles
-    WHERE uuid = ?
-    `
-	row := db.QueryRow(query, u.String())
-
-	article := new(Article)
-	var created []byte
-	var err error
-
-	if err := row.Scan(&article.ID, &article.Title, &created, &article.BannerLink, &article.Summary, &article.Published, &article.CreatorID, &article.IssueID, &article.EditedID, &article.Clicks, &article.IsInIssue, &article.AutoGenerated); err != nil {
-		return nil, fmt.Errorf("error scanning article row: %v", err)
-	}
-
-	article.UUID = u
-	article.Created, err = time.Parse("2006-01-02 15:04:05", string(created))
-	if err != nil {
-		return nil, fmt.Errorf("error parsing created: %v", err)
-	}
-
-	return article, nil
-}
-
 func (db *DB) GetCertainArticles(attribute string, value bool) ([]*Article, error) {
 	query := fmt.Sprintf(`
     SELECT id, title, created, banner_link, summary, creator_id, issue_id, clicks, published, rejected, is_in_issue, auto_generated, uuid

cmd/backend/config.go

@@ -158,10 +158,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 	if cliConfig.AESKeyFile != defaultConfig.AESKeyFile {
 		c.AESKeyFile = cliConfig.AESKeyFile
 	}
-	c.AESKeyFile, err = filepath.Abs(c.AESKeyFile)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for AESKeyFile: %v", err)
-	}
 	c.AESKeyFile, err = mkFile(c.AESKeyFile, 0600, 0700)
 	if err != nil {
 		return fmt.Errorf("error setting up file: %v", err)
@@ -170,10 +166,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 	if cliConfig.ArticleDir != defaultConfig.ArticleDir {
 		c.ArticleDir = cliConfig.ArticleDir
 	}
-	c.ArticleDir, err = filepath.Abs(c.ArticleDir)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for ArticleDir: %v", err)
-	}
 	c.ArticleDir, err = mkDir(c.ArticleDir, 0700)
 	if err != nil {
 		return fmt.Errorf("error setting up directory: %v", err)
@@ -182,10 +174,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 	if cliConfig.AtomFile != defaultConfig.AtomFile {
 		c.AtomFile = cliConfig.AtomFile
 	}
-	c.AtomFile, err = filepath.Abs(c.AtomFile)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for AtomFile: %v", err)
-	}
 	c.AtomFile, err = mkFile(c.AtomFile, 0644, 0744)
 	if err != nil {
 		return fmt.Errorf("error setting up file: %v", err)
@@ -214,10 +202,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 	if cliConfig.FirebaseKey != defaultConfig.FirebaseKey {
 		c.FirebaseKey = cliConfig.FirebaseKey
 	}
-	c.FirebaseKey, err = filepath.Abs(c.FirebaseKey)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for FirebaseKey: %v", err)
-	}
 	c.FirebaseKey, err = mkFile(c.FirebaseKey, 0600, 0700)
 	if err != nil {
 		return fmt.Errorf("error setting up file: %v", err)
@@ -230,10 +214,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 	if cliConfig.LogFile != defaultConfig.LogFile {
 		c.LogFile = cliConfig.LogFile
 	}
-	c.LogFile, err = filepath.Abs(c.LogFile)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for LogFile: %v", err)
-	}
 	c.LogFile, err = mkFile(c.LogFile, 0600, 0700)
 	if err != nil {
 		return fmt.Errorf("error setting up file: %v", err)
@@ -258,10 +238,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 	if cliConfig.PDFDir != defaultConfig.PDFDir {
 		c.PDFDir = cliConfig.PDFDir
 	}
-	c.PDFDir, err = filepath.Abs(c.PDFDir)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for PDFDir: %v", err)
-	}
 	c.PDFDir, err = mkDir(c.PDFDir, 0700)
 	if err != nil {
 		return fmt.Errorf("error setting up directory: %v", err)
@@ -270,10 +246,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 	if cliConfig.PicsDir != defaultConfig.PicsDir {
 		c.PicsDir = cliConfig.PicsDir
 	}
-	c.PicsDir, err = filepath.Abs(c.PicsDir)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for PicsDir: %v", err)
-	}
 	c.PicsDir, err = mkDir(c.PicsDir, 0700)
 	if err != nil {
 		return fmt.Errorf("error setting up directory: %v", err)
@@ -290,10 +262,6 @@ func (c *Config) setupConfig(cliConfig *Config) error {
 	if cliConfig.WebDir != defaultConfig.WebDir {
 		c.WebDir = cliConfig.WebDir
 	}
-	c.WebDir, err = filepath.Abs(c.WebDir)
-	if err != nil {
-		return fmt.Errorf("error setting absolute filepath for WebDir: %v", err)
-	}
 	c.WebDir, err = mkDir(c.WebDir, 0700)
 	if err != nil {
 		return fmt.Errorf("error setting up directory: %v", err)

cmd/backend/docx.go

@@ -14,13 +14,15 @@ import (
 func ConvertToMarkdown(c *Config, filename string) ([]byte, error) {
 	var stderr bytes.Buffer
 
-	tmpDir, err := os.MkdirTemp(os.TempDir(), "cpolis_images")
+	articleID := uuid.New()
+	articleFileName := fmt.Sprint("/tmp/", articleID, ".md")
+
+	tmpDir, err := os.MkdirTemp("/tmp", "cpolis_images")
 	if err != nil {
 		return nil, fmt.Errorf("error creating temporary directory: %v", err)
 	}
 	defer os.RemoveAll(tmpDir)
 
-	articleFileName := filepath.Join(os.TempDir(), fmt.Sprint(uuid.New(), ".md"))
 	cmd := exec.Command("pandoc", "-s", "-f", "docx", "-t", "commonmark_x", "-o", articleFileName, "--extract-media", tmpDir, filename) // TODO: Is writing to a file necessary?
 	cmd.Stderr = &stderr
 	if err = cmd.Run(); err != nil {
@@ -50,7 +52,7 @@ func ConvertToMarkdown(c *Config, filename string) ([]byte, error) {
 			return nil, fmt.Errorf("error saving image %v: %v", name, err)
 		}
 
-		articleContent = regexp.MustCompile(name).ReplaceAll(articleContent, []byte(c.Domain+"/image/serve/"+newImageName))
+		articleContent = regexp.MustCompile(name).ReplaceAll(articleContent, []byte(c.PicsDir+"/"+newImageName))
 	}
 
 	return articleContent, nil

cmd/calls/articles.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/google/uuid"
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
 
@@ -38,15 +37,15 @@ func ServeArticle(c *b.Config, db *b.DB) http.HandlerFunc {
 			return
 		}
 
-		uuidString := r.PathValue("uuid")
-		uuid, err := uuid.Parse(uuidString)
+		idString := r.PathValue("id")
+		id, err := strconv.ParseInt(idString, 10, 64)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		article, err := db.GetArticleByUUID(uuid)
+		article, err := db.GetArticle(id)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -57,7 +56,7 @@ func ServeArticle(c *b.Config, db *b.DB) http.HandlerFunc {
 			return
 		}
 
-		articleAbsName := fmt.Sprint(c.ArticleDir, "/", article.UUID, ".md")
+		articleAbsName := fmt.Sprint(c.ArticleDir, "/", article.ID, ".md")
 		contentBytes, err := os.ReadFile(articleAbsName)
 		if err != nil {
 			log.Println(err)

cmd/calls/atom.go

@@ -1,7 +1,9 @@
 package calls
 
 import (
+	"log"
 	"net/http"
+	"path/filepath"
 
 	b "streifling.com/jason/cpolis/cmd/backend"
 )
@@ -12,6 +14,13 @@ func ServeAtomFeed(c *b.Config) http.HandlerFunc {
 			return
 		}
 
-		http.ServeFile(w, r, c.AtomFile)
+		absFilepath, err := filepath.Abs(c.AtomFile)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		http.ServeFile(w, r, absFilepath)
 	}
 }

cmd/calls/images.go

@@ -1,6 +1,7 @@
 package calls
 
 import (
+	"log"
 	"net/http"
 	"path/filepath"
 
@@ -16,6 +17,13 @@ func ServeImage(c *b.Config, s map[string]*f.Session) http.HandlerFunc {
 			}
 		}
 
-		http.ServeFile(w, r, filepath.Join(c.PicsDir, r.PathValue("pic")))
+		absFilepath, err := filepath.Abs(c.PicsDir)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		http.ServeFile(w, r, absFilepath+"/"+r.PathValue("pic"))
 	}
 }

cmd/frontend/docx.go

@@ -44,15 +44,22 @@ func UploadDocx(c *b.Config, db *b.DB, s map[string]*Session) http.HandlerFunc {
 			return
 		}
 
-		docxFilepath := filepath.Join(os.TempDir(), fmt.Sprint(uuid.New(), ".docx"))
-		if err = os.WriteFile(docxFilepath, buf.Bytes(), 0644); err != nil {
+		docxFilename := fmt.Sprint(uuid.New(), ".docx")
+		absDocxFilepath, err := filepath.Abs("/tmp/" + docxFilename)
+		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		defer os.Remove(docxFilepath)
 
-		mdString, err := b.ConvertToMarkdown(c, docxFilepath)
+		if err = os.WriteFile(absDocxFilepath, buf.Bytes(), 0644); err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+		defer os.Remove(absDocxFilepath)
+
+		mdString, err := b.ConvertToMarkdown(c, absDocxFilepath)
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -60,8 +67,15 @@ func UploadDocx(c *b.Config, db *b.DB, s map[string]*Session) http.HandlerFunc {
 		}
 
 		uuidName := uuid.New()
-		mdFilepath := filepath.Join(c.ArticleDir, fmt.Sprint(uuidName, ".md"))
-		if err = os.WriteFile(mdFilepath, mdString, 0644); err != nil {
+		mdFilename := fmt.Sprint(uuidName, ".md")
+		absMdFilepath, err := filepath.Abs(c.ArticleDir + "/" + mdFilename)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		if err = os.WriteFile(absMdFilepath, mdString, 0644); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

cmd/frontend/pdf.go

@@ -44,11 +44,17 @@ func UploadPDF(c *b.Config, s map[string]*Session) http.HandlerFunc {
 			return
 		}
 
-		oldFilename := strings.Join(strings.Split(header.Filename, ".")[:len(header.Filename)-1], ".")
+		oldFilename := header.Filename
+		oldFilename = strings.Join(strings.Split(oldFilename, ".")[:len(oldFilename)-1], ".")
 		filename := fmt.Sprint(oldFilename, ".", uuid.New(), ".pdf")
-		filepath := filepath.Join(c.PDFDir, filename)
+		absFilepath, err := filepath.Abs(c.PDFDir + "/" + filename)
+		if err != nil {
+			log.Println(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
 
-		if err = b.WriteFile(filepath, file); err != nil {
+		if err = b.WriteFile(absFilepath, file); err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

cmd/main.go

@@ -52,7 +52,7 @@ func main() {
 	mux.HandleFunc("GET /article/review-edit/{id}", f.ReviewArticle(config, db, sessions, "allow-edit", "Artikel bearbeiten", "Bearbeiten erlauben"))
 	mux.HandleFunc("GET /article/review-rejected/{id}", f.ReviewRejectedArticle(config, db, sessions))
 	mux.HandleFunc("GET /article/review-unpublished/{id}", f.ReviewArticle(config, db, sessions, "publish", "Artikel veröffentlichen", "Veröffentlichen"))
-	mux.HandleFunc("GET /article/serve/{uuid}", c.ServeArticle(config, db))
+	mux.HandleFunc("GET /article/serve/{id}", c.ServeArticle(config, db))
 	mux.HandleFunc("GET /article/serve/{id}/clicks", c.ServeClicks(db))
 	mux.HandleFunc("GET /article/write", f.WriteArticle(config, db, sessions))
 	mux.HandleFunc("GET /atom/serve", c.ServeAtomFeed(config))