openidec

commit 26a0683227b78bec1e7dd0dfc70d41e48759a422
parent ef3e6a911e74b05bd6f18fe85560fba1246635c0
Author: Peter Kosyh <p.kosyh@gmail.com>
Date:   Tue,  1 Sep 2020 23:26:40 +0300

points.txt by default

Diffstat:
M
ii-node/main.go
 | 
19
+++++++++++++++----
M
ii-tool/main.go
 | 
4
+++-

2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ii-node/main.go b/ii-node/main.go
@@ -20,7 +20,7 @@ func open_db(path string) *ii.DB {
 }
 
 func PointMsg(db *ii.DB, pauth string, tmsg string) string {
-	udb := ii.LoadUsers(db.BundlePath() + ".usr")
+	udb := ii.LoadUsers(*users_opt)
 	if !udb.Access(pauth) {
 		ii.Info.Printf("Access denied for pauth: %s", pauth)
 		return "Access denied"
@@ -39,15 +39,26 @@ func PointMsg(db *ii.DB, pauth string, tmsg string) string {
 	return "msg ok"
 }
 
+var users_opt *string = flag.String("u", "points.txt", "Users database")
+var db_opt *string= flag.String("db", "./db", "II database path (directory)")
+var listen_opt *string = flag.String("L", ":8080", "Listen address")
+var sysname_opt *string = flag.String("sys", "ii-go", "Node name")
+var verbose_opt *bool = flag.Bool("v", false, "Verbose")
+
 func main() {
 	ii.OpenLog(ioutil.Discard, os.Stdout, os.Stderr)
 
-	db_opt := flag.String("db", "./db", "II database path (directory)")
-	listen_opt := flag.String("L", ":8080", "Listen address")
 	db := open_db(*db_opt)
+
 	flag.Parse()
+	if *verbose_opt {
+		ii.OpenLog(os.Stdout, os.Stdout, os.Stderr)
+	}
+
+	db.Name = *sysname_opt
+
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "%s\n", r.URL.Path)
+		fmt.Fprintf(w, "ii-go node\n", r.URL.Path)
 	})
 	http.HandleFunc("/list.txt", func(w http.ResponseWriter, r *http.Request) {
 		echoes := db.Echoes(nil)
diff --git a/ii-tool/main.go b/ii-tool/main.go
@@ -56,6 +56,8 @@ func main() {
 	db_opt := flag.String("db", "./db", "II database path (directory)")
 	lim_opt := flag.Int("lim", 0, "Fetch last N messages")
 	verbose_opt := flag.Bool("v", false, "Verbose")
+	users_opt := flag.String("u", "points.txt", "Users database")
+
 	flag.Parse()
 	if *verbose_opt {
 		ii.OpenLog(os.Stdout, os.Stdout, os.Stderr)
@@ -103,7 +105,7 @@ Options:
 			fmt.Printf("No argumnet(s) supplied\nShould be: name, e-mail and password.\n")
 			os.Exit(1)
 		}
-		db := open_users_db(*db_opt + ".usr")
+		db := open_users_db(*users_opt)
 		if err := db.Add(args[1], args[2], args[3]); err != nil {
 			fmt.Printf("Can not add user: %s\n", err)
 			os.Exit(1)