From 668e3dd7667972bd92f860fe68f4f63c1dcc9d0c Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Thu, 28 Jan 2021 15:06:51 +0100
Subject: [PATCH] simple authorized_keys file

---
 cmd/server/main.go      |  2 +-
 roomsrv/init_network.go | 21 +++++++++++++++++++++
 roomsrv/server.go       |  5 +++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/cmd/server/main.go b/cmd/server/main.go
index c01554b..57d91b3 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -79,7 +79,7 @@ func initFlags() {
 
 	flag.BoolVar(&flagDisableUNIXSock, "nounixsock", false, "disable the UNIX socket RPC interface")
 
-	flag.StringVar(&repoDir, "repo", filepath.Join(u.HomeDir, ".ssb-go"), "where to put the log and indexes")
+	flag.StringVar(&repoDir, "repo", filepath.Join(u.HomeDir, ".ssb-go-room"), "where to put the log and indexes")
 
 	flag.StringVar(&debugAddr, "dbg", "localhost:6078", "listen addr for metrics and pprof HTTP server")
 	flag.StringVar(&logToFile, "path", "", "where to write debug output to (otherwise just stderr)")
diff --git a/roomsrv/init_network.go b/roomsrv/init_network.go
index 5ef3453..f8d20a8 100644
--- a/roomsrv/init_network.go
+++ b/roomsrv/init_network.go
@@ -1,11 +1,14 @@
 package roomsrv
 
 import (
+	"bufio"
 	"fmt"
 	"net"
+	"os"
 	"sync"
 
 	kitlog "github.com/go-kit/kit/log"
+	"github.com/go-kit/kit/log/level"
 	"go.cryptoscope.co/muxrpc/v2"
 
 	refs "go.mindeco.de/ssb-refs"
@@ -18,6 +21,24 @@ import (
 func (s *Server) initNetwork() error {
 	s.authorizer.lst = make(map[string]struct{})
 
+	// simple authorized_keys file, new line delimited @feed.xzy
+	if f, err := os.Open(s.repo.GetPath("authorized_keys")); err == nil {
+		evtAuthedKeys := kitlog.With(s.logger, "event", "authorized_keys")
+		sc := bufio.NewScanner(f)
+		i := 0
+		for sc.Scan() {
+			fr, err := refs.ParseFeedRef(sc.Text())
+			if err != nil {
+				level.Warn(evtAuthedKeys).Log("skipping-line", i+1, "err", err)
+				continue
+			}
+			s.authorizer.Add(*fr)
+			i++
+		}
+		level.Info(evtAuthedKeys).Log("allowing", i)
+		f.Close()
+	}
+
 	// muxrpc handler creation and authoratization decider
 	mkHandler := func(conn net.Conn) (muxrpc.Handler, error) {
 		// bypassing badger-close bug to go through with an accept (or not) before closing the bot
diff --git a/roomsrv/server.go b/roomsrv/server.go
index b3474ff..eecee15 100644
--- a/roomsrv/server.go
+++ b/roomsrv/server.go
@@ -43,6 +43,7 @@ type Server struct {
 
 	loadUnixSock bool
 
+	repo     repo.Interface
 	repoPath string
 	keyPair  *keys.KeyPair
 
@@ -108,11 +109,11 @@ func New(opts ...Option) (*Server, error) {
 		s.rootCtx, s.Shutdown = context.WithCancel(context.Background())
 	}
 
-	r := repo.New(s.repoPath)
+	s.repo = repo.New(s.repoPath)
 
 	if s.keyPair == nil {
 		var err error
-		s.keyPair, err = repo.DefaultKeyPair(r)
+		s.keyPair, err = repo.DefaultKeyPair(s.repo)
 		if err != nil {
 			return nil, fmt.Errorf("sbot: failed to get keypair: %w", err)
 		}