fix: protect local HTTP boundary and saved setup credentials (#2)
This commit is contained in:
1 parent
134685d482
commit
c0c7804494
7 files changed
+184
-34
No files matched your search
+25
-10
@@ -82,11 +82,16 @@ func (h *SetupHandler) TestConnection(c *gin.Context) {
|
||||
port = p
|
||||
}
|
||||
|
||||
// If password is empty, try to use saved password
|
||||
if password == "" {
|
||||
if settings, err := h.localDB.GetSettings(); err == nil && settings != nil {
|
||||
password = settings.PasswordEncrypted // GetSettings returns decrypted password in this field
|
||||
}
|
||||
settings, err := h.localDB.GetSettings()
|
||||
if err != nil {
|
||||
_ = c.Error(err)
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to read settings"})
|
||||
return
|
||||
}
|
||||
password, err = setupPassword(settings, host, port, user, password)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusUnprocessableEntity, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
dsn := buildMySQLDSN(host, port, database, user, password, 5*time.Second)
|
||||
@@ -123,11 +128,10 @@ func (h *SetupHandler) SaveConnection(c *gin.Context) {
|
||||
port = p
|
||||
}
|
||||
|
||||
// If password is empty, use saved password
|
||||
if password == "" {
|
||||
if settings, err := h.localDB.GetSettings(); err == nil && settings != nil {
|
||||
password = settings.PasswordEncrypted // GetSettings returns decrypted password in this field
|
||||
}
|
||||
password, err := setupPassword(existingSettings, host, port, user, password)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusUnprocessableEntity, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// Test connection first
|
||||
@@ -210,3 +214,14 @@ func buildMySQLDSN(host string, port int, database, user, password string, timeo
|
||||
}
|
||||
return cfg.FormatDSN()
|
||||
}
|
||||
|
||||
// setupPassword reuses a credential only for its saved destination and account.
|
||||
func setupPassword(saved *localdb.ConnectionSettings, host string, port int, user, password string) (string, error) {
|
||||
if password != "" || saved == nil {
|
||||
return password, nil
|
||||
}
|
||||
if saved.Host != host || saved.Port != port || saved.User != user {
|
||||
return "", fmt.Errorf("Password is required when changing host, port or user")
|
||||
}
|
||||
return saved.PasswordEncrypted, nil
|
||||
}
|
||||
Reference in new issue
Block a user