mirror of
https://github.com/riwiwa/muzi.git
synced 2026-02-28 11:56:57 -08:00
add error check to rand in generateID
This commit is contained in:
24
web/web.go
24
web/web.go
@@ -43,15 +43,22 @@ func init() {
|
|||||||
templates = template.Must(template.New("").Funcs(funcMap).ParseGlob("./templates/*.gohtml"))
|
templates = template.Must(template.New("").Funcs(funcMap).ParseGlob("./templates/*.gohtml"))
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateID() string {
|
func generateID() (string, error) {
|
||||||
b := make([]byte, 16)
|
b := make([]byte, 16)
|
||||||
rand.Read(b)
|
_, err := rand.Read(b)
|
||||||
return hex.EncodeToString(b)
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(b), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func createSession(username string) string {
|
func createSession(username string) string {
|
||||||
sessionID := generateID()
|
sessionID, err := generateID()
|
||||||
_, err := db.Pool.Exec(
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "Error generating sessionID: %v\n", err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
_, err = db.Pool.Exec(
|
||||||
context.Background(),
|
context.Background(),
|
||||||
"INSERT INTO sessions (session_id, username, expires_at) VALUES ($1, $2, NOW() + INTERVAL '30 days');",
|
"INSERT INTO sessions (session_id, username, expires_at) VALUES ($1, $2, NOW() + INTERVAL '30 days');",
|
||||||
sessionID,
|
sessionID,
|
||||||
@@ -409,7 +416,12 @@ func importLastFMHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
jobID := generateID()
|
jobID, err := generateID()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "Error generating jobID: %v\n", err)
|
||||||
|
http.Error(w, "Error generating jobID", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
progressChan := make(chan migrate.ProgressUpdate, 100)
|
progressChan := make(chan migrate.ProgressUpdate, 100)
|
||||||
|
|
||||||
jobsMu.Lock()
|
jobsMu.Lock()
|
||||||
|
|||||||
Reference in New Issue
Block a user