Merge branch 'master' into AGDNS-2591-web-start-time

Author: ainar-g

internal/home/authhttp.go

@@ -374,37 +374,68 @@ func (mw *authMiddlewareDefault) Wrap(h http.Handler) (wrapped http.Handler) {
 		}
 
 		path := r.URL.Path
-		u, err := mw.userFromRequest(ctx, r)
-		if err != nil {
-			mw.logger.ErrorContext(ctx, "retrieving user from request", slogutil.KeyError, err)
+		if mw.handleAuthenticatedUser(ctx, w, r, h, path) {
+			return
 		}
 
-		if u != nil {
-			if path == "/login.html" {
-				http.Redirect(w, r, "/", http.StatusFound)
+		if mw.handlePublicAccess(w, r, h, path) {
+			return
+		}
 
-				return
-			}
+		w.WriteHeader(http.StatusUnauthorized)
+	})
+}
 
-			h.ServeHTTP(w, r.WithContext(withWebUser(ctx, u)))
+// handleAuthenticatedUser tries to get user from request and processes request
+// if user was successfully authenticated.  Returns true if request was handled.
+func (mw *authMiddlewareDefault) handleAuthenticatedUser(
+	ctx context.Context,
+	w http.ResponseWriter,
+	r *http.Request,
+	h http.Handler,
+	path string,
+) (ok bool) {
+	u, err := mw.userFromRequest(ctx, r)
+	if err != nil {
+		mw.logger.ErrorContext(ctx, "retrieving user from request", slogutil.KeyError, err)
+	}
 
-			return
-		}
+	if u == nil {
+		return false
+	}
 
-		if isPublicResource(path) {
-			h.ServeHTTP(w, r)
+	if path == "/login.html" {
+		http.Redirect(w, r, "/", http.StatusFound)
 
-			return
-		}
+		return true
+	}
 
-		if path == "/" || path == "/index.html" {
-			http.Redirect(w, r, "login.html", http.StatusFound)
+	h.ServeHTTP(w, r.WithContext(withWebUser(ctx, u)))
 
-			return
-		}
+	return true
+}
 
-		w.WriteHeader(http.StatusUnauthorized)
-	})
+// handlePublicAccess handles request if user is trying to access public or root
+// pages.
+func (mw *authMiddlewareDefault) handlePublicAccess(
+	w http.ResponseWriter,
+	r *http.Request,
+	h http.Handler,
+	path string,
+) (ok bool) {
+	if isPublicResource(path) {
+		h.ServeHTTP(w, r)
+
+		return true
+	}
+
+	if path == "/" || path == "/index.html" {
+		http.Redirect(w, r, "login.html", http.StatusFound)
+
+		return true
+	}
+
+	return false
 }
 
 // needsAuthentication returns true if there are stored web users and requests

internal/home/controlupdate.go

@@ -228,55 +228,59 @@ func finishUpdate(
 	cleanup(ctx)
 	cleanupAlways()
 
-	var err error
 	if runtime.GOOS == "windows" {
-		if runningAsService {
-			// NOTE: We can't restart the service via "kardianos/service"
-			// package, because it kills the process first we can't start a new
-			// instance, because Windows doesn't allow it.
-			//
-			// TODO(a.garipov): Recheck the claim above.
-			var cmd executil.Command
-			cmd, err = cmdCons.New(ctx, &executil.CommandConfig{
-				Path: "cmd",
-				Args: []string{"/c", "net stop AdGuardHome & net start AdGuardHome"},
-			})
-			if err != nil {
-				panic(fmt.Errorf("constructing cmd: %w", err))
-			}
-
-			err = cmd.Start(ctx)
-			if err != nil {
-				panic(fmt.Errorf("restarting service: %w", err))
-			}
-
-			os.Exit(osutil.ExitCodeSuccess)
-		}
+		finalizeWindowsUpdate(ctx, l, cmdCons, execPath, runningAsService)
 
-		l.InfoContext(ctx, "restarting", "exec_path", execPath, "args", os.Args[1:])
+		os.Exit(osutil.ExitCodeSuccess)
+	}
+
+	var err error
+	l.InfoContext(ctx, "restarting", "exec_path", execPath, "args", os.Args[1:])
+	err = syscall.Exec(execPath, os.Args, os.Environ())
+	if err != nil {
+		panic(fmt.Errorf("restarting: %w", err))
+	}
+}
 
-		var cmd executil.Command
-		cmd, err = cmdCons.New(ctx, &executil.CommandConfig{
+// finalizeWindowsUpdate completes an update procedure on windows.  l and
+// cmdCons must not be nil.
+func finalizeWindowsUpdate(ctx context.Context,
+	l *slog.Logger,
+	cmdCons executil.CommandConstructor,
+	execPath string,
+	runningAsService bool,
+) {
+	var commandConf *executil.CommandConfig
+
+	if runningAsService {
+		// NOTE: We can't restart the service via "kardianos/service" package,
+		// because it kills the process first we can't start a new instance,
+		// because Windows doesn't allow it.
+		//
+		// TODO(a.garipov): Recheck the claim above.
+		commandConf = &executil.CommandConfig{
+			Path: "cmd",
+			Args: []string{"/c", "net stop AdGuardHome & net start AdGuardHome"},
+		}
+	} else {
+		commandConf = &executil.CommandConfig{
 			Path:   execPath,
 			Args:   os.Args[1:],
 			Stdin:  os.Stdin,
 			Stdout: os.Stdout,
 			Stderr: os.Stderr,
-		})
-		if err != nil {
-			panic(fmt.Errorf("constructing cmd: %w", err))
 		}
+	}
 
-		err = cmd.Start(ctx)
-		if err != nil {
-			panic(fmt.Errorf("restarting: %w", err))
-		}
+	l.InfoContext(ctx, "restarting", "exec_path", execPath, "args", os.Args[1:])
 
-		os.Exit(osutil.ExitCodeSuccess)
+	var cmd executil.Command
+	cmd, err := cmdCons.New(ctx, commandConf)
+	if err != nil {
+		panic(fmt.Errorf("constructing cmd: %w", err))
 	}
 
-	l.InfoContext(ctx, "restarting", "exec_path", execPath, "args", os.Args[1:])
-	err = syscall.Exec(execPath, os.Args, os.Environ())
+	err = cmd.Start(ctx)
 	if err != nil {
 		panic(fmt.Errorf("restarting: %w", err))
 	}