add --disable-global-search

README.md

@@ -37,6 +37,7 @@ Use these to configure your Andesite instance. All are optional. "Name" refers t
 | `--hash-concurrency` | | `int` | cpu count | Number of hashes to run concurrently. |
 | `--custom-root-public` | | `string[]` | none | Similar to `"roots_public"`, passed in the form `name=path`. |
 | `--custom-root-private` | | `string[]` | none | Similar to `"roots_private"`, passed in the form `name=path`. |
+| `--disable-global-search` | `bool` | `false` | When true, `/search` requires being an admin to use. |
 
 > Note: for `--enable-search` and `--disable-search`, sending values to these flags will trigger a background scan of the root directory you point it at (whether that be `public`, `files`, etc). As such, unless content is changed or updated, it is not necessary to pass these flags across multiple runs of the app.
 

main.go

@@ -6,6 +6,7 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/nektro/andesite/pkg/config"
 	"github.com/nektro/andesite/pkg/db"
 	"github.com/nektro/andesite/pkg/fsdb"
 	"github.com/nektro/andesite/pkg/handler"
@@ -47,6 +48,7 @@ func main() {
 	vflag.IntVar(&idata.Config.HashPllel, "hash-concurrency", runtime.NumCPU(), "")
 	vflag.StringArrayVar(&idata.Config.CRootsPub, "custom-root-public", []string{}, "")
 	vflag.StringArrayVar(&idata.Config.CRootsPrv, "custom-root-private", []string{}, "")
+	vflag.BoolVar(&config.GlobalSearchOff, "disable-global-search", false, "")
 	etc.PreInit()
 
 	etc.Init(&idata.Config, "./files/", db.SaveOAuth2InfoCb)

pkg/config/config.go

@@ -0,0 +1,5 @@
+package config
+
+var (
+	GlobalSearchOff bool
+)

pkg/handler/search.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/nektro/andesite/pkg/config"
 	"github.com/nektro/andesite/pkg/db"
 	"github.com/nektro/andesite/pkg/idata"
 
@@ -12,7 +13,7 @@ import (
 )
 
 func HandleSearch(w http.ResponseWriter, r *http.Request) {
-	_, user, err := ApiBootstrap(r, w, []string{http.MethodGet}, false, false, true)
+	_, user, err := ApiBootstrap(r, w, []string{http.MethodGet}, config.GlobalSearchOff, config.GlobalSearchOff, true)
 	if err != nil {
 		return
 	}
@@ -25,7 +26,7 @@ func HandleSearch(w http.ResponseWriter, r *http.Request) {
 }
 
 func HandleSearchAPI(w http.ResponseWriter, r *http.Request) {
-	_, user, err := ApiBootstrap(r, w, []string{http.MethodGet}, false, false, false)
+	_, user, err := ApiBootstrap(r, w, []string{http.MethodGet}, config.GlobalSearchOff, config.GlobalSearchOff, false)
 	if err != nil {
 		WriteJSON(w, map[string]interface{}{
 			"response": "bad",