mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-14 06:39:40 +01:00
[GITEA] Make atomic ssh keys replacement robust
- After stumbling upon https://github.com/golang/go/issues/22397 and reading the implementations I realized that Forgejo code doesn't have `Sync()` and it doesn't properly error handle the `Close` function. - (likely) Resolves https://codeberg.org/forgejo/forgejo/issues/1446 (cherry picked from commit0efcb334c2
) (cherry picked from commit04ef02c0dd
) (cherry picked from commit85f2065c9b
) (cherry picked from commit8d36b5cce6
) (cherry picked from commit378dc30fb5
) (cherry picked from commit2b28bf826e
) (cherry picked from commitd0625a001e
) (cherry picked from commitf161a4f60f
) (cherry picked from commit7430ca43e5
) (cherry picked from commitab6d38daf7
) (cherry picked from commit0f703fd02e
) (cherry picked from commit6931a8f6bb
) (cherry picked from commit5e2065c1c0
) (cherry picked from commit38c812acff
) (cherry picked from commit494874e23f
)
This commit is contained in:
parent
a1cd6f4e3a
commit
d396b7fd47
2 changed files with 12 additions and 2 deletions
|
@ -169,7 +169,12 @@ func RewriteAllPublicKeys(ctx context.Context) error {
|
|||
return err
|
||||
}
|
||||
|
||||
t.Close()
|
||||
if err := t.Sync(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := t.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.Rename(tmpPath, fPath)
|
||||
}
|
||||
|
||||
|
|
|
@ -92,7 +92,12 @@ func RewriteAllPrincipalKeys(ctx context.Context) error {
|
|||
return err
|
||||
}
|
||||
|
||||
t.Close()
|
||||
if err := t.Sync(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := t.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.Rename(tmpPath, fPath)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue