mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11:25 +01:00
bircni
c5f674111a
Reverts #1126, #1125, #1124, #1123 and #1122. `go.mod` keeps the Go 1.26 line with toolchain `go1.26.9` (instead of the original `go1.26.6`) so the security fix from #1131 isn't lost. reopens #69 reopens #141 reopens #162 reopens #172 reopens #197 reopens #232 reopens #240 reopens #246 reopens #323 reopens #325 reopens #326 reopens #328 reopens #344 reopens #351 reopens #373 reopens #403 reopens #406 reopens #417 reopens #430 reopens #457 reopens #480 reopens #482 reopens #489 reopens #490 reopens #498 reopens #500 reopens #504 reopens #510 reopens #516 reopens #523 reopens #556 reopens #560 reopens #569 reopens #571 reopens #602 reopens #632 reopens #633 reopens #643 reopens #666 reopens #670 reopens #672 reopens #677 reopens #683 reopens #697 reopens #726 reopens #737 reopens #770 reopens #779 reopens #804 reopens #817 reopens #831 reopens #833 reopens #834 reopens #908 reopens #966 reopens #1023 reopens #1029 reopens #1032 reopens #1050 reopens #1052 reopens #1069 reopens #1073 reopens #1087 reopens #1091 reopens #1094 reopens #1110 reopens #1115 reopens #1116 reopens #1118 Reviewed-on: https://gitea.com/gitea/tea/pulls/1146 Reviewed-by: TheFox0x7 <95654+thefox0x7@noreply.gitea.com>
86 lines
2.3 KiB
Go
86 lines
2.3 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"sync"
|
|
"time"
|
|
|
|
"gitea.dev/tea/modules/filelock"
|
|
)
|
|
|
|
const (
|
|
// LockTimeout is the default timeout for acquiring the config file lock.
|
|
LockTimeout = 5 * time.Second
|
|
|
|
// mutexPollInterval is how often to retry acquiring the in-process mutex.
|
|
mutexPollInterval = 10 * time.Millisecond
|
|
)
|
|
|
|
// configMutex protects in-process concurrent access to the config.
|
|
var configMutex sync.Mutex
|
|
|
|
// acquireConfigLock acquires both the in-process mutex and a file lock.
|
|
// Returns an unlock function that must be called to release both locks.
|
|
// The timeout applies to acquiring the file lock; the mutex acquisition
|
|
// uses the same timeout via a TryLock loop.
|
|
func acquireConfigLock(lockPath string, timeout time.Duration) (unlock func() error, err error) {
|
|
// Try to acquire mutex with timeout
|
|
deadline := time.Now().Add(timeout)
|
|
for {
|
|
if configMutex.TryLock() {
|
|
break
|
|
}
|
|
if time.Now().After(deadline) {
|
|
return nil, fmt.Errorf("timeout waiting for config mutex")
|
|
}
|
|
time.Sleep(mutexPollInterval)
|
|
}
|
|
|
|
// Mutex acquired, now try file lock
|
|
remaining := max(time.Until(deadline), 0)
|
|
locker := filelock.New(lockPath, remaining)
|
|
|
|
fileUnlock, err := locker.Acquire()
|
|
if err != nil {
|
|
configMutex.Unlock()
|
|
return nil, err
|
|
}
|
|
|
|
// Return unlock function
|
|
return func() error {
|
|
unlockErr := fileUnlock()
|
|
configMutex.Unlock()
|
|
return unlockErr
|
|
}, nil
|
|
}
|
|
|
|
// getConfigLockPath returns the path to the lock file for the config.
|
|
func getConfigLockPath() string {
|
|
return GetConfigPath() + ".lock"
|
|
}
|
|
|
|
// withConfigLock executes the given function while holding the config lock.
|
|
// It acquires the lock, reloads the config from disk, executes fn, and releases the lock.
|
|
func withConfigLock(fn func() error) (retErr error) {
|
|
lockPath := getConfigLockPath()
|
|
unlock, err := acquireConfigLock(lockPath, LockTimeout)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to acquire config lock: %w", err)
|
|
}
|
|
defer func() {
|
|
if unlockErr := unlock(); unlockErr != nil && retErr == nil {
|
|
retErr = fmt.Errorf("failed to release config lock: %w", unlockErr)
|
|
}
|
|
}()
|
|
|
|
// Reload config from disk to get latest state
|
|
if err := reloadConfigFromDisk(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return fn()
|
|
}
|