Remove a bunch of unused cruft

internal/server.go

@@ -6,21 +6,17 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"syscall"
 	"time"
 
 	"git.mills.io/prologic/observe"
 	"github.com/NYTimes/gziphandler"
-	"github.com/gabstv/merger"
 	"github.com/justinas/nosurf"
 	"github.com/robfig/cron"
 	log "github.com/sirupsen/logrus"
 	"github.com/unrolled/logger"
 
 	"git.mills.io/prologic/spyda"
-	"git.mills.io/prologic/spyda/internal/auth"
-	"git.mills.io/prologic/spyda/internal/passwords"
 	"git.mills.io/prologic/spyda/internal/session"
 	"git.mills.io/prologic/spyda/internal/static"
 )
@@ -56,18 +52,9 @@ type Server struct {
 	// Dispatcher
 	tasks *Dispatcher
 
-	// Auth
-	am *auth.Manager
-
 	// Sessions
-	sc *SessionStore
+	sc session.Store
 	sm *session.Manager
-
-	// API
-	api *API
-
-	// Passwords
-	pm passwords.Passwords
 }
 
 func (s *Server) render(name string, w http.ResponseWriter, ctx *Context) {
@@ -164,37 +151,6 @@ func (s *Server) setupMetrics() {
 		},
 	)
 
-	// sessions
-	metrics.NewGaugeFunc(
-		"server", "sessions",
-		"Number of active in-memory sessions (non-persistent)",
-		func() float64 {
-			return float64(s.sc.Count())
-		},
-	)
-
-	// database keys
-	metrics.NewGaugeFunc(
-		"db", "sessions",
-		"Number of database /sessions keys",
-		func() float64 {
-			return float64(s.db.LenSessions())
-		},
-	)
-	metrics.NewGaugeFunc(
-		"db", "users",
-		"Number of database /users keys",
-		func() float64 {
-			return float64(s.db.LenUsers())
-		},
-	)
-	metrics.NewGaugeFunc(
-		"db", "tokens",
-		"Number of database /tokens keys",
-		func() float64 {
-			return float64(s.db.LenTokens())
-		},
-	)
 	metrics.NewGaugeFunc(
 		"db", "urls",
 		"Number of database /urls keys",
@@ -311,18 +267,6 @@ func (s *Server) initRoutes() {
 	s.router.GET("/cache/:hash", s.CacheHandler())
 	s.router.HEAD("/cache/:hash", s.CacheHandler())
 
-	s.router.GET("/login", s.am.HasAuth(s.LoginHandler()))
-	s.router.POST("/login", s.LoginHandler())
-
-	s.router.GET("/logout", s.LogoutHandler())
-	s.router.POST("/logout", s.LogoutHandler())
-
-	// Reset Password
-	s.router.GET("/pwreset", s.ResetPasswordHandler())
-	s.router.POST("/pwreset", s.ResetPasswordHandler())
-	s.router.GET("/chpasswd", s.ResetPasswordMagicLinkHandler())
-	s.router.POST("/chpasswd", s.NewPasswordHandler())
-
 	// Task State
 	s.router.GET("/tasks", s.TasksHandler())
 	s.router.GET("/task/:uuid", s.TaskHandler())
@@ -330,13 +274,6 @@ func (s *Server) initRoutes() {
 	s.router.GET("/add", s.AddHandler())
 	s.router.POST("/add", s.AddHandler())
 
-	s.router.GET("/manage", s.ManageHandler())
-	s.router.POST("/manage", s.ManageHandler())
-
-	s.router.GET("/manage/users", s.ManageUsersHandler())
-	s.router.POST("/manage/adduser", s.AddUserHandler())
-	s.router.POST("/manage/deluser", s.DelUserHandler())
-
 	// Support
 	s.router.GET("/support", s.SupportHandler())
 	s.router.POST("/support", s.SupportHandler())
@@ -353,16 +290,6 @@ func NewServer(bind string, options ...Option) (*Server, error) {
 		}
 	}
 
-	settings, err := LoadSettings(filepath.Join(config.Data, "settings.yaml"))
-	if err != nil {
-		log.Warnf("error loading pod settings: %s", err)
-	} else {
-		if err := merger.MergeOverwrite(config, settings); err != nil {
-			log.WithError(err).Error("error merging pod settings")
-			return nil, err
-		}
-	}
-
 	if err := config.Validate(); err != nil {
 		log.WithError(err).Error("error validating config")
 		return nil, fmt.Errorf("error validating config: %w", err)
@@ -387,14 +314,9 @@ func NewServer(bind string, options ...Option) (*Server, error) {
 
 	router := NewRouter()
 
-	am := auth.NewManager(auth.NewOptions("/login", "/register"))
-
 	tasks := NewDispatcher(2, 10) // TODO: Make this configurable?
 
-	pm := passwords.NewScryptPasswords(nil)
-
-	sc := NewSessionStore(db, config.SessionCacheTTL)
-
+	sc := session.NewMemoryStore(config.SessionExpiry)
 	sm := session.NewManager(
 		session.NewOptions(
 			config.Name,
@@ -417,8 +339,6 @@ func NewServer(bind string, options ...Option) (*Server, error) {
 		return nil, err
 	}
 
-	api := NewAPI(router, config, db, pm)
-
 	csrfHandler := nosurf.New(router)
 	csrfHandler.ExemptGlob("/api/v1/*")
 
@@ -440,9 +360,6 @@ func NewServer(bind string, options ...Option) (*Server, error) {
 			),
 		},
 
-		// API
-		api: api,
-
 		// Indexer
 		indexer: indexer,
 
@@ -458,15 +375,9 @@ func NewServer(bind string, options ...Option) (*Server, error) {
 		// Dispatcher
 		tasks: tasks,
 
-		// Auth Manager
-		am: am,
-
 		// Session Manager
 		sc: sc,
 		sm: sm,
-
-		// Password Manager
-		pm: pm,
 	}
 
 	if err := server.setupCronJobs(); err != nil {
@@ -488,17 +399,14 @@ func NewServer(bind string, options ...Option) (*Server, error) {
 	// Log interesting configuration options
 	log.Infof("Instance Name: %s", server.config.Name)
 	log.Infof("Base URL: %s", server.config.BaseURL)
-	log.Infof("Admin User: %s", server.config.AdminUser)
 	log.Infof("Admin Name: %s", server.config.AdminName)
 	log.Infof("Admin Email: %s", server.config.AdminEmail)
 	log.Infof("SMTP Host: %s", server.config.SMTPHost)
 	log.Infof("SMTP Port: %d", server.config.SMTPPort)
 	log.Infof("SMTP User: %s", server.config.SMTPUser)
 	log.Infof("SMTP From: %s", server.config.SMTPFrom)
-	log.Infof("API Session Time: %s", server.config.APISessionTime)
 
 	server.initRoutes()
-	api.initRoutes()
 
 	go server.runStartupJobs()