Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: fix go linter
Kyle Mendell4948dde46b95
diff --git a/backend/internal/services/auth_service.go b/backend/internal/services/auth_service.goindex a2dac7dde..afe130dc4 100644--- a/backend/internal/services/auth_service.go+++ b/backend/internal/services/auth_service.go@@ -12,7 +12,6 @@ import ("github.com/golang-jwt/jwt/v5""github.com/ofkm/arcane-backend/internal/config"- "github.com/ofkm/arcane-backend/internal/dto""github.com/ofkm/arcane-backend/internal/models""github.com/ofkm/arcane-backend/internal/utils")@@ -71,7 +70,6 @@ type UserClaims struct {Roles []string `json:"roles"`}-// AuthService handles authentication related operationstype AuthService struct {userService *UserServicesettingsService *SettingsService@@ -82,20 +80,10 @@ type AuthService struct {}func NewAuthService(userService *UserService, settingsService *SettingsService, jwtSecret string, cfg *config.Config) *AuthService {- var secretBytes []byte- if jwtSecret != "" {- secretBytes = []byte(jwtSecret)- } else {- secretBytes = make([]byte, 32)- if _, err := rand.Read(secretBytes); err != nil {- panic(fmt.Errorf("failed to generate random JWT secret: %w", err))- }- }-return &AuthService{userService: userService,settingsService: settingsService,- jwtSecret: secretBytes,+ jwtSecret: utils.CheckOrGenerateJwtSecret(jwtSecret),accessExpiry: 30 * time.Minute,refreshExpiry: 7 * 24 * time.Hour,config: cfg,@@ -114,7 +102,6 @@ func (s *AuthService) getAuthSettings(ctx context.Context) (*AuthSettings, errorSessionTimeout: settings.AuthSessionTimeout.AsInt() / 60, // Convert seconds to minutes}- // Parse OIDC config from JSON if enabledif authSettings.OidcEnabled && settings.AuthOidcConfig.Value != "" {var oidcConfig models.OidcConfigif err := json.Unmarshal([]byte(settings.AuthOidcConfig.Value), &oidcConfig); err == nil {@@ -154,34 +141,6 @@ func (s *AuthService) GetOidcConfigurationStatus(ctx context.Context) (*OidcStatreturn status, nil}-func (s *AuthService) updateAuthSettings(ctx context.Context, authSettings *AuthSettings) ([]models.SettingVariable, error) {- // Convert minutes to seconds for timeout- timeoutSeconds := authSettings.SessionTimeout * 60-- updates := dto.UpdateSettingsDto{- AuthLocalEnabled: utils.Ptr(fmt.Sprintf("%t", authSettings.LocalAuthEnabled)),- AuthOidcEnabled: utils.Ptr(fmt.Sprintf("%t", authSettings.OidcEnabled)),- AuthSessionTimeout: utils.Ptr(fmt.Sprintf("%d", timeoutSeconds)),- }-- // Add OIDC config if present- if authSettings.Oidc != nil {- oidcConfigBytes, err := json.Marshal(authSettings.Oidc)- if err != nil {- return nil, fmt.Errorf("failed to marshal OIDC config: %w", err)- }- updates.AuthOidcConfig = utils.Ptr(string(oidcConfigBytes))- }-- settings, err := s.settingsService.UpdateSettings(ctx, updates)- if err != nil {- return nil, fmt.Errorf("failed to update auth settings: %w", err)- }-- return settings, nil-}--// GetSessionTimeout returns the configured session timeout in minutesfunc (s *AuthService) GetSessionTimeout(ctx context.Context) (int, error) {settings, err := s.settingsService.GetSettings(ctx)if err != nil {@@ -219,7 +178,6 @@ func (s *AuthService) IsOidcEnabled(ctx context.Context) (bool, error) {return settings.AuthOidcEnabled.IsTrue(), nil}-// GetOidcConfig retrieves the OIDC configurationfunc (s *AuthService) GetOidcConfig(ctx context.Context) (*models.OidcConfig, error) {authSettings, err := s.getAuthSettings(ctx)if err != nil {@@ -300,7 +258,6 @@ func (s *AuthService) Login(ctx context.Context, username, password string) (*moreturn user, tokenPair, nil}-// OidcLogin authenticates or creates a user from OIDC provider infofunc (s *AuthService) OidcLogin(ctx context.Context, userInfo OidcUserInfo) (*models.User, *TokenPair, error) {oidcEnabled, err := s.IsOidcEnabled(ctx)if err != nil {@@ -372,7 +329,6 @@ func (s *AuthService) OidcLogin(ctx context.Context, userInfo OidcUserInfo) (*moreturn user, tokenPair, nil}-// RefreshToken generates a new token pair from a refresh tokenfunc (s *AuthService) RefreshToken(ctx context.Context, refreshToken string) (*TokenPair, error) {token, err := jwt.ParseWithClaims(refreshToken, &jwt.RegisteredClaims{},func(t *jwt.Token) (interface{}, error) {@@ -414,7 +370,6 @@ func (s *AuthService) RefreshToken(ctx context.Context, refreshToken string) (*Treturn tokenPair, nil}-// VerifyToken verifies and returns the user from an access tokenfunc (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*models.User, error) {token, err := jwt.ParseWithClaims(accessToken, &UserClaims{},func(t *jwt.Token) (interface{}, error) {@@ -458,7 +413,6 @@ func (s *AuthService) VerifyToken(ctx context.Context, accessToken string) (*modreturn user, nil}-// ChangePassword changes a user's passwordfunc (s *AuthService) ChangePassword(ctx context.Context, userID, currentPassword, newPassword string) error {user, err := s.userService.GetUserByID(ctx, userID)if err != nil {@@ -482,14 +436,6 @@ func (s *AuthService) ChangePassword(ctx context.Context, userID, currentPassworreturn err}-// RequestPasswordReset initiates password reset (placeholder)-func (s *AuthService) RequestPasswordReset(ctx context.Context, username string) error {- return errors.New("password reset not implemented")-}--// Helper functions--// generateTokenPair creates an access and refresh token pair for a userfunc (s *AuthService) generateTokenPair(ctx context.Context, user *models.User) (*TokenPair, error) {sessionTimeout, err := s.GetSessionTimeout(ctx)if err != nil {@@ -544,7 +490,6 @@ func (s *AuthService) generateTokenPair(ctx context.Context, user *models.User)}, nil}-// generateUserId creates a unique user IDfunc generateUserId() string {b := make([]byte, 16)_, err := rand.Read(b)@@ -554,7 +499,6 @@ func generateUserId() string {return fmt.Sprintf("usr_%s", base64.RawURLEncoding.EncodeToString(b))}-// generateUsernameFromEmail creates a username from email or fallback to subjectfunc generateUsernameFromEmail(email, subject string) string {if email != "" {parts := strings.Split(email, "@")diff --git a/backend/internal/services/auto_update_service.go b/backend/internal/services/auto_update_service.goindex 43650a9ab..1b60dae20 100644--- a/backend/internal/services/auto_update_service.go+++ b/backend/internal/services/auto_update_service.go@@ -96,7 +96,7 @@ func (s *AutoUpdateService) CheckForUpdates(ctx context.Context, req dto.AutoUpdreturn result, nil}-// New method to handle image-based updates+//nolint:gocognitfunc (s *AutoUpdateService) processImageUpdates(ctx context.Context, req dto.AutoUpdateCheckDto, result *dto.AutoUpdateResultDto) error {imageUpdates, err := s.imageUpdateService.CheckAllImages(ctx, 0)if err != nil {@@ -182,7 +182,6 @@ func (s *AutoUpdateService) processImageUpdates(ctx context.Context, req dto.Autreturn nil}-// Refactored method to handle container-based updates (original approach)func (s *AutoUpdateService) processContainerBasedUpdates(ctx context.Context, req dto.AutoUpdateCheckDto, result *dto.AutoUpdateResultDto, startTime time.Time) (*dto.AutoUpdateResultDto, error) {var wg sync.WaitGroupresultsChan := make(chan dto.AutoUpdateResourceResult, 1000)@@ -279,7 +278,6 @@ func (s *AutoUpdateService) pullImageWithAuth(ctx context.Context, imageRef strireturn nil}-// Refactored from restartContainersUsingUpdatedImagesfunc (s *AutoUpdateService) restartContainersUsingImages(ctx context.Context, updatedImages map[string]string) ([]dto.AutoUpdateResourceResult, error) {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {@@ -699,7 +697,6 @@ func (s *AutoUpdateService) updateStack(func (s *AutoUpdateService) checkImageForUpdate(ctx context.Context,imageRef string,- currentImageID string,) (bool, string, error) {if s.isDigestBasedImage(imageRef) {return false, "", nil@@ -1126,9 +1123,7 @@ func (s *AutoUpdateService) checkStackImagesForUpdates(ctx context.Context, staccontinue}- currentImageID := serviceImageIDs[serviceName]-- hasUpdate, newDigest, err := s.checkImageForUpdate(ctx, imageRef, currentImageID)+ hasUpdate, newDigest, err := s.checkImageForUpdate(ctx, imageRef)if err != nil {log.Printf("Error checking updates for %s in stack %s: %v", imageRef, stack.Name, err)continuediff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex fcc6723dc..5a92410d5 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -18,7 +18,7 @@ import (type SettingsService struct {db *database.DB- config *config.Config // Add config field+ config *config.Config}func NewSettingsService(db *database.DB, cfg *config.Config) *SettingsService {@@ -40,8 +40,9 @@ func (s *SettingsService) GetSettings(ctx context.Context) (*models.Settings, er// Load values from database into the structfor _, sv := range settingVars {if err := settings.UpdateField(sv.Key, sv.Value, false); err != nil {- // If key not found, it's okay - might be a deprecated setting- if _, ok := err.(models.SettingKeyNotFoundError); !ok {+ // If key not found, it's okay+ var notFoundErr models.SettingKeyNotFoundError+ if !errors.As(err, ¬FoundErr) {return nil, fmt.Errorf("failed to load setting %s: %w", sv.Key, err)}}diff --git a/backend/internal/utils/jwt_util.go b/backend/internal/utils/jwt_util.gonew file mode 100644index 000000000..a64657556--- /dev/null+++ b/backend/internal/utils/jwt_util.go@@ -0,0 +1,20 @@+package utils++import (+ "crypto/rand"+ "fmt"+)++func CheckOrGenerateJwtSecret(jwtSecret string) []byte {+ var secretBytes []byte+ if jwtSecret != "" {+ secretBytes = []byte(jwtSecret)+ return secretBytes+ } else {+ secretBytes = make([]byte, 32)+ if _, err := rand.Read(secretBytes); err != nil {+ panic(fmt.Errorf("failed to generate random JWT secret: %w", err))+ }+ }+ return nil+}