infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-12 19:44:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

When removing an account, wait for the last account reference has gone away before removing the files.

Browse Source 
The intent to remove the account is stored in the database. At startup, if
there are any such referenes, they are applied by removing the account
directories and the entry in the database. This ensures the account directory
is properly removed, even on incomplete shutdown.

Don't add an account when its directory already exits.
This commit is contained in:
Mechiel Lukkien
2025-03-15 12:22:04 +01:00
parent c4255a96f8
commit ac4b006ecd
7 changed files with 209 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
admin/admin.go
View File

@ -10,6 +10,7 @@ import (
"encoding/pem"
"errors"
"fmt"
"io/fs"
"log/slog"
"os"
"path/filepath"
@ -661,6 +662,15 @@ func AccountAdd(ctx context.Context, account, address string) (rerr error) {
return fmt.Errorf("%w: account already present", ErrRequest)
}
// Ensure the directory does not exist, e.g. due to pending account removal, or an
// otherwise failed cleanup.
accountDir := filepath.Join(mox.DataDirPath("accounts"), account)
if _, err := os.Stat(accountDir); err == nil {
return fmt.Errorf("%w: account directory %q already/still exists", ErrRequest, accountDir)
} else if !errors.Is(err, fs.ErrNotExist) {
return fmt.Errorf(`%w: stat account directory %q, expected "does not exist": %v`, ErrRequest, accountDir, err)
}
if err := checkAddressAvailable(addr); err != nil {
return fmt.Errorf("%w: address not available: %v", ErrRequest, err)
}
@ -690,12 +700,20 @@ func AccountRemove(ctx context.Context, account string) (rerr error) {
}
}()
// Open account now. The deferred Close MUST happen after the dynamic unlock,
// because during tests the consistency checker takes the same lock.
acc, err := store.OpenAccount(log, account, false)
if err != nil {
return fmt.Errorf("%w: open account: %v", ErrRequest, err)
}
defer func() {
err := acc.Close()
log.Check(err, "closing account after error")
}()
defer mox.Conf.DynamicLockUnlock()()
c := mox.Conf.Dynamic
if _, ok := c.Accounts[account]; !ok {
return fmt.Errorf("%w: account does not exist", ErrRequest)
}
// Compose new config without modifying existing data structures. If we fail, we
// leave no trace.
@ -711,28 +729,11 @@ func AccountRemove(ctx context.Context, account string) (rerr error) {
return fmt.Errorf("writing domains.conf: %w", err)
}
odir := filepath.Join(mox.DataDirPath("accounts"), account)
tmpdir := filepath.Join(mox.DataDirPath("tmp"), "oldaccount-"+account)
if err := os.Rename(odir, tmpdir); err != nil {
log.Errorx("moving old account data directory out of the way", err, slog.String("account", account))
return fmt.Errorf("account removed, but account data directory %q could not be moved out of the way: %v", odir, err)
}
if err := os.RemoveAll(tmpdir); err != nil {
log.Errorx("removing old account data directory", err, slog.String("account", account))
return fmt.Errorf("account removed, its data directory moved to %q, but removing failed: %v", odir, err)
if err := acc.Remove(context.Background()); err != nil {
return fmt.Errorf("account removed from configuration file, but scheduling account directory for removal failed: %v", err)
}
if err := store.TLSPublicKeyRemoveForAccount(context.Background(), account); err != nil {
log.Errorx("removing tls public keys for removed account", err)
return fmt.Errorf("account removed, but removing tls public keys failed: %v", err)
}
if err := store.LoginAttemptRemoveAccount(context.Background(), account); err != nil {
log.Errorx("removing historic login attempts for removed account", err)
return fmt.Errorf("account removed, but removing historic login attempts failed: %v", err)
}
log.Info("account removed", slog.String("account", account))
log.Info("account marked for removal", slog.String("account", account))
return nil
}