BreizhHardware/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2026-01-18 16:17:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Comments

Browse Source
This commit is contained in:
binwiederhier
2025-07-31 11:28:27 +02:00
parent 8f930acfb8
commit a1c6dd2085
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/user.go
View File

@@ -378,7 +378,7 @@ func createUserManager(c *cli.Context) (*user.Manager, error) {
Filename: authFile, Filename: authFile,
StartupQueries: authStartupQueries, StartupQueries: authStartupQueries,
DefaultAccess: authDefault, DefaultAccess: authDefault,
ProvisionEnabled: false, // Do not re-provision users on manager initialization ProvisionEnabled: false, // Hack: Do not re-provision users on manager initialization
BcryptCost: user.DefaultUserPasswordBcryptCost, BcryptCost: user.DefaultUserPasswordBcryptCost,
QueueWriterInterval: user.DefaultUserStatsQueueWriterInterval, QueueWriterInterval: user.DefaultUserStatsQueueWriterInterval,
} }

7
user/manager.go
View File

@@ -564,7 +564,7 @@ type Config struct {
Filename string // Database filename, e.g. "/var/lib/ntfy/user.db" Filename string // Database filename, e.g. "/var/lib/ntfy/user.db"
StartupQueries string // Queries to run on startup, e.g. to create initial users or tiers StartupQueries string // Queries to run on startup, e.g. to create initial users or tiers
DefaultAccess Permission // Default permission if no ACL matches DefaultAccess Permission // Default permission if no ACL matches
ProvisionEnabled bool // Enable auto-provisioning of users and access grants, disabled for "ntfy user" commands ProvisionEnabled bool // Hack: Enable auto-provisioning of users and access grants, disabled for "ntfy user" commands
Users []*User // Predefined users to create on startup Users []*User // Predefined users to create on startup
Access map[string][]*Grant // Predefined access grants to create on startup (username -> []*Grant) Access map[string][]*Grant // Predefined access grants to create on startup (username -> []*Grant)
Tokens map[string][]*Token // Predefined users to create on startup (username -> []*Token) Tokens map[string][]*Token // Predefined users to create on startup (username -> []*Token)
@@ -605,7 +605,7 @@ func NewManager(config *Config) (*Manager, error) {
statsQueue: make(map[string]*Stats), statsQueue: make(map[string]*Stats),
tokenQueue: make(map[string]*TokenUpdate), tokenQueue: make(map[string]*TokenUpdate),
} }
if err := manager.maybeProvisionUsersAndAccess(); err != nil { if err := manager.maybeProvisionUsersAccessAndTokens(); err != nil {
return nil, err return nil, err
} }
go manager.asyncQueueWriter(config.QueueWriterInterval) go manager.asyncQueueWriter(config.QueueWriterInterval)
@@ -1736,7 +1736,8 @@ func (a *Manager) Close() error {
return a.db.Close() return a.db.Close()
} }
func (a *Manager) maybeProvisionUsersAndAccess() error { // maybeProvisionUsersAccessAndTokens provisions users, access control entries, and tokens based on the config.
func (a *Manager) maybeProvisionUsersAccessAndTokens() error {
if !a.config.ProvisionEnabled { if !a.config.ProvisionEnabled {
return nil return nil
} }