gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filer: do not print password on error

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/1809
This commit is contained in:
Chris Lu
2021-02-17 02:13:50 -08:00
parent 5579caf5a5
commit 3f8b0da677
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed/filer/mysql/mysql_store.go
View File

@@ -51,8 +51,10 @@ func (store *MysqlStore) initialize(user, password, hostname string, port int, d
} }
sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, password, hostname, port, database) sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, password, hostname, port, database)
adaptedSqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, "<ADAPTED>", hostname, port, database)
if interpolateParams { if interpolateParams {
sqlUrl += "&interpolateParams=true" sqlUrl += "&interpolateParams=true"
adaptedSqlUrl += "&interpolateParams=true"
} }
var dbErr error var dbErr error
@@ -60,7 +62,7 @@ func (store *MysqlStore) initialize(user, password, hostname string, port int, d
if dbErr != nil { if dbErr != nil {
store.DB.Close() store.DB.Close()
store.DB = nil store.DB = nil
return fmt.Errorf("can not connect to %s error:%v", sqlUrl, err) return fmt.Errorf("can not connect to %s error:%v", adaptedSqlUrl, err)
} }
store.DB.SetMaxIdleConns(maxIdle) store.DB.SetMaxIdleConns(maxIdle)

4
weed/filer/mysql2/mysql2_store.go
View File

@@ -54,8 +54,10 @@ func (store *MysqlStore2) initialize(createTable, user, password, hostname strin
} }
sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, password, hostname, port, database) sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, password, hostname, port, database)
adaptedSqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, user, "<ADAPTED>", hostname, port, database)
if interpolateParams { if interpolateParams {
sqlUrl += "&interpolateParams=true" sqlUrl += "&interpolateParams=true"
adaptedSqlUrl += "&interpolateParams=true"
} }
var dbErr error var dbErr error
@@ -63,7 +65,7 @@ func (store *MysqlStore2) initialize(createTable, user, password, hostname strin
if dbErr != nil { if dbErr != nil {
store.DB.Close() store.DB.Close()
store.DB = nil store.DB = nil
return fmt.Errorf("can not connect to %s error:%v", sqlUrl, err) return fmt.Errorf("can not connect to %s error:%v", adaptedSqlUrl, err)
} }
store.DB.SetMaxIdleConns(maxIdle) store.DB.SetMaxIdleConns(maxIdle)

8
weed/filer/postgres/postgres_store.go
View File

@@ -47,28 +47,32 @@ func (store *PostgresStore) initialize(user, password, hostname string, port int
store.SupportBucketTable = false store.SupportBucketTable = false
store.SqlGenerator = &SqlGenPostgres{ store.SqlGenerator = &SqlGenPostgres{
CreateTableSqlTemplate: "", CreateTableSqlTemplate: "",
DropTableSqlTemplate: `drop table "%s"`, DropTableSqlTemplate: `drop table "%s"`,
} }
sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, hostname, port, sslmode) sqlUrl := fmt.Sprintf(CONNECTION_URL_PATTERN, hostname, port, sslmode)
if user != "" { if user != "" {
sqlUrl += " user=" + user sqlUrl += " user=" + user
} }
adaptedSqlUrl := sqlUrl
if password != "" { if password != "" {
sqlUrl += " password=" + password sqlUrl += " password=" + password
adaptedSqlUrl += " password=ADAPTED"
} }
if database != "" { if database != "" {
sqlUrl += " dbname=" + database sqlUrl += " dbname=" + database
adaptedSqlUrl += " dbname=" + database
} }
if schema != "" { if schema != "" {
sqlUrl += " search_path=" + schema sqlUrl += " search_path=" + schema
adaptedSqlUrl += " search_path=" + schema
} }
var dbErr error var dbErr error
store.DB, dbErr = sql.Open("postgres", sqlUrl) store.DB, dbErr = sql.Open("postgres", sqlUrl)
if dbErr != nil { if dbErr != nil {
store.DB.Close() store.DB.Close()
store.DB = nil store.DB = nil
return fmt.Errorf("can not connect to %s error:%v", sqlUrl, err) return fmt.Errorf("can not connect to %s error:%v", adaptedSqlUrl, err)
} }
store.DB.SetMaxIdleConns(maxIdle) store.DB.SetMaxIdleConns(maxIdle)

6
weed/filer/postgres2/postgres2_store.go
View File

@@ -57,21 +57,25 @@ func (store *PostgresStore2) initialize(createTable, user, password, hostname st
if user != "" { if user != "" {
sqlUrl += " user=" + user sqlUrl += " user=" + user
} }
adaptedSqlUrl := sqlUrl
if password != "" { if password != "" {
sqlUrl += " password=" + password sqlUrl += " password=" + password
adaptedSqlUrl += " password=ADAPTED"
} }
if database != "" { if database != "" {
sqlUrl += " dbname=" + database sqlUrl += " dbname=" + database
adaptedSqlUrl += " dbname=" + database
} }
if schema != "" { if schema != "" {
sqlUrl += " search_path=" + schema sqlUrl += " search_path=" + schema
adaptedSqlUrl += " search_path=" + schema
} }
var dbErr error var dbErr error
store.DB, dbErr = sql.Open("postgres", sqlUrl) store.DB, dbErr = sql.Open("postgres", sqlUrl)
if dbErr != nil { if dbErr != nil {
store.DB.Close() store.DB.Close()
store.DB = nil store.DB = nil
return fmt.Errorf("can not connect to %s error:%v", sqlUrl, err) return fmt.Errorf("can not connect to %s error:%v", adaptedSqlUrl, err)
} }
store.DB.SetMaxIdleConns(maxIdle) store.DB.SetMaxIdleConns(maxIdle)