Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only request write when necessary #18657

Merged
merged 8 commits into from
Feb 8, 2022
Merged

Only request write when necessary #18657

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
740aa78
Only request write when necessary
Feb 7, 2022
0c2149a
Fix perm
Feb 7, 2022
21380bd
Merge branch 'main' into use-read
Feb 7, 2022
5fe8c39
Update setting.go
wxiaoguang Feb 7, 2022
b34e92d
Update setting.go
wxiaoguang Feb 7, 2022
fe94433
Update setting.go
wxiaoguang Feb 7, 2022
d7c303a
Merge branch 'main' into use-read
zeripath Feb 7, 2022
c090059
Merge branch 'main' into use-read
zeripath Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions modules/setting/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package setting
import (
"encoding/base64"
"fmt"
"io"
"math"
"net"
"net/url"
Expand Down Expand Up @@ -1080,28 +1079,22 @@ func loadInternalToken(sec *ini.Section) string {
}
switch tempURI.Scheme {
case "file":
fp, err := os.OpenFile(tempURI.RequestURI(), os.O_RDWR, 0o600)
if err != nil {
buf, err := os.ReadFile(tempURI.RequestURI())
if err != nil && !os.IsNotExist(err) {
log.Fatal("Failed to open InternalTokenURI (%s): %v", uri, err)
}
defer fp.Close()

buf, err := io.ReadAll(fp)
if err != nil {
log.Fatal("Failed to read InternalTokenURI (%s): %v", uri, err)
}
// No token in the file, generate one and store it.
if len(buf) == 0 {
token, err := generate.NewInternalToken()
if err != nil {
log.Fatal("Error generate internal token: %v", err)
}
if _, err := io.WriteString(fp, token); err != nil {
err = os.WriteFile(tempURI.RequestURI(), []byte(token), 0o600)
if err != nil {
log.Fatal("Error writing to InternalTokenURI (%s): %v", uri, err)
}
return token
}

return strings.TrimSpace(string(buf))
default:
log.Fatal("Unsupported URI-Scheme %q (INTERNAL_TOKEN_URI = %q)", tempURI.Scheme, uri)
Expand Down