add user auth and modify readme

Author: lsongdev

README.md

@@ -1,19 +1,42 @@
-# feedreader
+# FeedReader
 
-> FeedReader - Self-hosted RSS Feed Aggregator Service
+> **FeedReader**: A Self-hosted RSS Feed Aggregator Service
+
+FeedReader offers a sleek solution for aggregating RSS and ATOM feeds. Designed for those who prefer self-hosted services, it features a minimalistic web UI and supports the Fever API, making it compatible with mainstream RSS clients.
+
+## Screenshots
+
+### Web UI
+
+The server comes with a built-in, minimal web UI for easy feed management.
+
+![Web UI](./screenshots/web.jpg)
+
+### Fever API Support
+
+FeedReader supports the [Fever API](https://github.com/song940/fever-go), enabling integration with various RSS client apps.
+
+![Fever API](./screenshots/app.jpg)
+
+## Features
+
+- **Minimalist Implementation**: Supports both RSS and ATOM feeds, with OPML import/export functionality.
+- **Fever API Integration**: Compatible with popular RSS client apps through built-in Fever API support.
 
 ## Installation
 
+To install FeedReader, run the following commands in your terminal:
+
 ```shell
-curl -L https://github.com/song940/feedreader/releases/download/latest/reader-linux-amd64 -o /usr/bin/feedreader
-chmod +x /usr/bin/feedreader
+curl -L https://github.com/song940/feedreader/releases/download/<tag>/reader-linux-$(uname -m) -o /usr/local/bin/feedreader
+chmod +x /usr/local/bin/feedreader
 ```
 
-Create a service file in `/etc/systemd/system/feedreader.service`:
+Then, create a systemd service file for FeedReader:
 
 ```ini
 [Unit]
-Description=FeedReader - Self-hosted RSS Feed Aggregator Service
+Description=FeedReader - A Self-hosted RSS Feed Aggregator Service
 Documentation=https://github.com/song940/feedreader
 After=network-online.target
 Wants=network-online.target systemd-networkd-wait-online.service
@@ -25,18 +48,6 @@ ExecStart=/usr/local/bin/feedreader
 WantedBy=multi-user.target
 ```
 
-## Usage
-
-```shell
-Usage of feedreader:
-  -d string
-        working directory (default "/etc/feedreader")
-  -l string
-        address to listen (default ":8080")
-```
-
-## Contributors
-
 ## License
 
-MIT
+FeedReader is released under the MIT License. For more details, see the [LICENSE](LICENSE) file in the repository.

config.yaml

@@ -0,0 +1,6 @@
+
+title: Kubernetes Cluster
+
+users:
+  - username: admin
+    password: admin12311

go.mod

@@ -5,7 +5,8 @@ go 1.22
 require (
 	github.com/glebarez/go-sqlite v1.21.2
 	github.com/song940/feedparser-go v0.0.0-20240223130218-14bcc1571069
-	github.com/song940/fever-go v0.0.0-20240222065552-1b87f4b59c91
+	github.com/song940/fever-go v0.0.0-20240312072349-37e9e89e38f9
+	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (

go.sum

@@ -15,9 +15,17 @@ github.com/song940/feedparser-go v0.0.0-20240223130218-14bcc1571069 h1:4+gpJBJl+
 github.com/song940/feedparser-go v0.0.0-20240223130218-14bcc1571069/go.mod h1:/k8QoFfeRkL4X11Kek7kztz4iMkmz+JgWtjfFWUi6Rs=
 github.com/song940/fever-go v0.0.0-20240222065552-1b87f4b59c91 h1:0ej6sHA3Xb0JSqqOcUmvRML+yLm/OPdR+mss09S8J+s=
 github.com/song940/fever-go v0.0.0-20240222065552-1b87f4b59c91/go.mod h1:Ox/T/hOL3vvkaINHo6cgcuLTh6nGCs8D0bYlIxlJ6qk=
+github.com/song940/fever-go v0.0.0-20240312064621-8877d03c4761 h1:w3yEYRPbZJkvPJk1Ye0VXqOBGTGBIqVXvis3JFTqPDk=
+github.com/song940/fever-go v0.0.0-20240312064621-8877d03c4761/go.mod h1:Ox/T/hOL3vvkaINHo6cgcuLTh6nGCs8D0bYlIxlJ6qk=
+github.com/song940/fever-go v0.0.0-20240312072349-37e9e89e38f9 h1:wTT0BKW2u3zYF8Ar0WHD0Mmqqika46jtPnwaMEBppfw=
+github.com/song940/fever-go v0.0.0-20240312072349-37e9e89e38f9/go.mod h1:Ox/T/hOL3vvkaINHo6cgcuLTh6nGCs8D0bYlIxlJ6qk=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
 modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
 modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=

main.go

@@ -5,41 +5,43 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"time"
 
 	"github.com/song940/feedreader/reader"
 	"github.com/song940/fever-go/fever"
 )
 
 func main() {
-	var root, addr string
-	userconfig, err := os.UserConfigDir()
+	config := reader.NewConfig()
+	conf, err := os.UserConfigDir()
 	if err != nil {
-		panic(err)
+		conf = "/etc"
 	}
-	root = path.Join(userconfig, "feedreader")
-	flag.StringVar(&root, "d", root, "working directory")
-	flag.StringVar(&addr, "l", ":8080", "address to listen")
+	dir := path.Join(conf, "feedreader")
+	flag.StringVar(&config.Dir, "d", dir, "config directory")
 	flag.Parse()
+	config.Load()
 
-	server, err := reader.NewReader(&reader.Config{
-		Dir:      root,
-		Interval: 5 * time.Minute,
-	})
+	server, err := reader.NewReader(config)
 	if err != nil {
 		panic(err)
 	}
+
 	api := fever.New(server)
-	http.HandleFunc("/", server.IndexView)
-	http.HandleFunc("/new", server.NewView)
-	http.HandleFunc("/posts", server.PostView)
-	http.HandleFunc("/feeds", server.FeedView)
-	http.HandleFunc("/import", server.ImportView)
-	http.HandleFunc("/rss.xml", server.RssXML)
-	http.HandleFunc("/atom.xml", server.AomXML)
-	http.HandleFunc("/opml.xml", server.OpmlXML)
-	http.Handle("/fever/", api)
-	err = http.ListenAndServe(addr, nil)
+	router := http.NewServeMux()
+	router.HandleFunc("/", server.IndexView)
+	router.HandleFunc("/new", server.NewView)
+	router.HandleFunc("/posts", server.PostView)
+	router.HandleFunc("/feeds", server.FeedView)
+	router.HandleFunc("/refresh", server.RefreshView)
+	router.HandleFunc("/import", server.ImportView)
+	router.HandleFunc("/categories", server.CategoryView)
+	router.HandleFunc("/rss.xml", server.RssXml)
+	router.HandleFunc("/atom.xml", server.AomXml)
+	router.HandleFunc("/opml.xml", server.OpmlXml)
+	router.HandleFunc("/feeds.json", server.FeedsJson)
+	router.HandleFunc("/posts.json", server.PostsJson)
+	router.Handle("/fever/", api)
+	err = http.ListenAndServe(config.Listen, router)
 	if err != nil {
 		panic(err)
 	}

reader/api.go

@@ -1,6 +1,7 @@
 package reader
 
 import (
+	"crypto/md5"
 	"fmt"
 	"log"
 	"strconv"
@@ -9,26 +10,50 @@ import (
 	"github.com/song940/fever-go/fever"
 )
 
+func (user *User) FeverAuthKey() string {
+	// md5(user.username +":"+ user.password)
+	str := fmt.Sprintf("%s:%s", user.Username, user.Password)
+	return fmt.Sprintf("%X", md5.Sum([]byte(str)))
+}
+
 // FeverAuthenticate implements fever.Handler.
-func (*Reader) FeverAuthenticate(apiKey string) bool {
-	return true
+func (r *Reader) FeverAuthenticate(apiKey string) bool {
+	log.Println("Authenticating", apiKey)
+	for _, user := range r.config.Users {
+		if apiKey == user.FeverAuthKey() {
+			return true
+		}
+	}
+	return false
 }
 
 func (r *Reader) FeverGroups() (response fever.GroupsResponse) {
+	categories, err := r.GetCategories()
+	if err != nil {
+		log.Fatalf("Failed to get categories: %v", err)
+		return
+	}
+	response.Groups = make([]fever.Group, 0, len(categories))
+	for _, group := range categories {
+		response.Groups = append(response.Groups, fever.Group{
+			ID:    int64(group.Id),
+			Title: group.Name,
+		})
+	}
 	feeds, err := r.GetFeeds(nil)
 	if err != nil {
-		log.Fatalf("Failed to get subscriptions: %v", err)
+		log.Fatalf("Failed to get feeds: %v", err)
 		return
 	}
-	feedIds := make([]string, 0, len(feeds))
+	var feedGroups = make(map[int][]string)
 	for _, feed := range feeds {
-		feedIds = append(feedIds, strconv.Itoa(int(feed.Id)))
+		feedGroups[feed.Category.Id] = append(feedGroups[feed.Category.Id], strconv.Itoa(feed.Id))
 	}
-	response.Groups = []fever.Group{
-		{ID: 1, Title: "All"},
-	}
-	response.FeedsGroups = []fever.FeedsGroups{
-		{GroupID: 1, FeedIDs: strings.Join(feedIds, ",")},
+	for groupId, feedIds := range feedGroups {
+		response.FeedsGroups = append(response.FeedsGroups, fever.FeedsGroups{
+			GroupID: int64(groupId),
+			FeedIDs: strings.Join(feedIds, ","),
+		})
 	}
 	return
 }
@@ -39,6 +64,7 @@ func (r *Reader) FeverFeeds() (response fever.FeedsResponse) {
 		log.Fatalf("Failed to get subscriptions: %v", err)
 		return
 	}
+	var groups map[int][]string = make(map[int][]string)
 	for _, feed := range feeds {
 		response.Feeds = append(response.Feeds, fever.Feed{
 			ID:          int64(feed.Id),
@@ -49,13 +75,12 @@ func (r *Reader) FeverFeeds() (response fever.FeedsResponse) {
 			IsSpark:     1,
 			LastUpdated: feed.CreatedAt.Unix(),
 		})
+		groups[feed.Category.Id] = append(groups[feed.Category.Id], strconv.Itoa(feed.Id))
 	}
-	feedIds := make([]string, 0, len(feeds))
-	for _, feed := range feeds {
-		feedIds = append(feedIds, strconv.Itoa(int(feed.Id)))
-	}
-	response.FeedsGroups = []fever.FeedsGroups{
-		{GroupID: 1, FeedIDs: strings.Join(feedIds, ",")},
+	for id, feedIds := range groups {
+		response.FeedsGroups = append(response.FeedsGroups, fever.FeedsGroups{
+			GroupID: int64(id), FeedIDs: strings.Join(feedIds, ","),
+		})
 	}
 	return response
 }