fix: simplify auth handling

garethgeorge · Sep 9, 2024 · 6894128 · 6894128
1 parent 491a6a6
commit 6894128
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 37 deletions.
diff --git a/cmd/backrest/backrest.go b/cmd/backrest/backrest.go
@@ -62,9 +62,6 @@ func main() {
 		zap.S().Fatalf("error loading config: %v", err)
 	}
 
-	// Create the authenticator
-	authenticator := auth.NewAuthenticator(getSecret(), configStore)
-
 	var wg sync.WaitGroup
 
 	// Create / load the operation log
@@ -110,6 +107,7 @@ func main() {
 		logStore,
 	)
 
+	authenticator := auth.NewAuthenticator(getSecret(), configStore)
 	apiAuthenticationHandler := api.NewAuthenticationHandler(authenticator)
 
 	mux := http.NewServeMux()

diff --git a/cmd/devtools/oplogexport/.gitignore b/cmd/devtools/oplogexport/.gitignore
diff --git a/internal/auth/auth.go b/internal/auth/auth.go
@@ -12,16 +12,6 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-var (
-	anonymousUser = &v1.User{
-		Name:     "default",
-		Password: &v1.User_PasswordBcrypt{PasswordBcrypt: "JDJhJDEwJDNCdzJoNFlhaWFZQy9TSDN3ZGxSRHVPZHdzV2lsNmtBSHdFSmtIWHk1dS8wYjZuUWJrMGFx"}, // default password is "password"
-	}
-	defaultUsers = []*v1.User{
-		anonymousUser,
-	}
-)
-
 type Authenticator struct {
 	config config.ConfigStore
 	key    []byte
@@ -43,7 +33,7 @@ func (a *Authenticator) Login(username, password string) (*v1.User, error) {
 		return nil, fmt.Errorf("get config: %w", err)
 	}
 	auth := config.GetAuth()
-	if auth.GetDisabled() {
+	if auth == nil || auth.GetDisabled() {
 		return nil, errors.New("authentication is disabled")
 	}
 

diff --git a/internal/config/validate.go b/internal/config/validate.go
@@ -143,7 +143,7 @@ func validatePlan(plan *v1.Plan, repos map[string]*v1.Repo) error {
 }
 
 func validateAuth(auth *v1.Auth) error {
-	if auth.Disabled {
+	if auth == nil || auth.Disabled {
 		return nil
 	}
 

diff --git a/webui/src/views/LoginModal.tsx b/webui/src/views/LoginModal.tsx
@@ -11,27 +11,6 @@ export const LoginModal = () => {
   const [form] = Form.useForm();
   const alertApi = useAlertApi()!;
 
-  useEffect(() => {
-    authenticationService
-      .login(
-        new LoginRequest({
-          username: "default",
-          password: "password",
-        })
-      )
-      .then((loginResponse) => {
-        alertApi.success(
-          "No users configured yet, logged in with default credentials",
-          5
-        );
-        setAuthToken(loginResponse.token);
-        setTimeout(() => {
-          window.location.reload();
-        }, 500);
-      })
-      .catch((e) => {});
-  }, []);
-
   const onFinish = async (values: any) => {
     const loginReq = new LoginRequest({
       username: values.username,