-
Notifications
You must be signed in to change notification settings - Fork 414
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fix password conf update/test(#2446)
Signed-off-by: yisaer <[email protected]>
- Loading branch information
Showing
6 changed files
with
165 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,7 @@ import ( | |
|
|
||
| "github.com/gorilla/mux" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "github.com/stretchr/testify/suite" | ||
|
|
||
| "github.com/lf-edge/ekuiper/internal/conf" | ||
|
|
@@ -160,7 +161,7 @@ func (suite *MetaTestSuite) TestConnectionConfKeyHandler() { | |
| } | ||
|
|
||
| func (suite *MetaTestSuite) TestSinkConfKeyHandler() { | ||
| req, _ := http.NewRequest(http.MethodPut, "/metadata/sinks/mqtt/confKeys/test", bytes.NewBufferString(`{"qos": 0, "server": "tcp://10.211.55.6:1883"}`)) | ||
| req, _ := http.NewRequest(http.MethodPut, "/metadata/sinks/mqtt/confKeys/test", bytes.NewBufferString(`{"qos": 0, "server": "tcp://10.211.55.6:1883", "password":"123456"}`)) | ||
| DataDir, _ := conf.GetDataLoc() | ||
| os.MkdirAll(path.Join(DataDir, "sinks"), 0o755) | ||
| if _, err := os.Create(path.Join(DataDir, "sinks", "mqtt.yaml")); err != nil { | ||
|
|
@@ -169,6 +170,16 @@ func (suite *MetaTestSuite) TestSinkConfKeyHandler() { | |
| w := httptest.NewRecorder() | ||
| suite.r.ServeHTTP(w, req) | ||
| assert.Equal(suite.T(), http.StatusOK, w.Code) | ||
| got := replacePasswdForConfig("sink", "mqtt", map[string]interface{}{ | ||
| "resourceId": "test", | ||
| "a": "123", | ||
| "password": "******", | ||
| }) | ||
| require.Equal(suite.T(), map[string]interface{}{ | ||
| "resourceId": "test", | ||
| "a": "123", | ||
| "password": "123456", | ||
| }, got) | ||
| os.Remove(path.Join(DataDir, "sinks", "mqtt.yaml")) | ||
| os.Remove(path.Join(DataDir, "sinks")) | ||
| } | ||
|
|
@@ -181,7 +192,7 @@ func (suite *MetaTestSuite) TestResourcesHandler() { | |
| } | ||
|
|
||
| func (suite *MetaTestSuite) TestHiddenPassword() { | ||
| req, _ := http.NewRequest(http.MethodPut, "/metadata/connections/test/confKeys/test", bytes.NewBufferString(`{"password": "123456", "url": "sqlserver://username:[email protected]/testdb"}`)) | ||
| req, _ := http.NewRequest(http.MethodPut, "/metadata/connections/test/confKeys/test", bytes.NewBufferString(`{"password": "123456","token":"123456","url": "sqlserver://username:[email protected]/testdb"}`)) | ||
| w := httptest.NewRecorder() | ||
| DataDir, _ := conf.GetDataLoc() | ||
| os.MkdirAll(path.Join(DataDir, "connections"), 0o755) | ||
|
|
@@ -194,7 +205,7 @@ func (suite *MetaTestSuite) TestHiddenPassword() { | |
| w = httptest.NewRecorder() | ||
| suite.r.ServeHTTP(w, req) | ||
| assert.Equal(suite.T(), http.StatusOK, w.Code) | ||
| assert.Equal(suite.T(), bytes.NewBufferString(`{"test":{"password":"******","url":"sqlserver://username:%2A%2A%2A%2A%2A%[email protected]/testdb"}}`), w.Body) | ||
| assert.Equal(suite.T(), bytes.NewBufferString(`{"test":{"password":"******","token":"******","url":"sqlserver://username:%2A%2A%2A%2A%2A%[email protected]/testdb"}}`), w.Body) | ||
|
|
||
| os.Remove(path.Join(DataDir, "connections", "connection.yaml")) | ||
| os.Remove(path.Join(DataDir, "connections")) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // Copyright 2023 EMQ Technologies Co., Ltd. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package hidden | ||
|
|
||
| import ( | ||
| "net/url" | ||
| "strings" | ||
| ) | ||
|
|
||
| const ( | ||
| PASSWORD = "******" | ||
| ) | ||
|
|
||
| var hiddenPasswdKey map[string]struct{} | ||
|
|
||
| func init() { | ||
| hiddenPasswdKey = map[string]struct{}{ | ||
| "password": {}, | ||
| "token": {}, | ||
| } | ||
| } | ||
|
|
||
| func HiddenPassword(kvs map[string]interface{}) map[string]interface{} { | ||
| for k, v := range kvs { | ||
| if m, ok := v.(map[string]interface{}); ok { | ||
| kvs[k] = HiddenPassword(m) | ||
| } | ||
| if _, ok := hiddenPasswdKey[strings.ToLower(k)]; ok { | ||
| kvs[k] = PASSWORD | ||
| } | ||
| if strings.ToLower(k) == "url" { | ||
| if _, ok := v.(string); !ok { | ||
| continue | ||
| } | ||
| u, err := url.Parse(v.(string)) | ||
| if err != nil || u.User == nil { | ||
| continue | ||
| } | ||
| password, _ := u.User.Password() | ||
| if password != "" { | ||
| u.User = url.UserPassword(u.User.Username(), PASSWORD) | ||
| kvs[k] = u.String() | ||
| } | ||
| } | ||
| } | ||
| return kvs | ||
| } | ||
|
|
||
| func ReplacePasswd(resource, config map[string]interface{}) map[string]interface{} { | ||
| for key := range hiddenPasswdKey { | ||
| if hiddenPasswd, ok := config[key]; ok && hiddenPasswd == PASSWORD { | ||
| if passwd, ok := resource[key]; ok { | ||
| if _, ok := passwd.(string); ok { | ||
| config[key] = passwd | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return config | ||
| } | ||
|
|
||
| func ReplaceUrl(resource, config map[string]interface{}) map[string]interface{} { | ||
| if urlRaw, ok := config["url"]; ok { | ||
| if urlS, ok := urlRaw.(string); ok { | ||
| if u, err := url.Parse(urlS); err == nil { | ||
| if passwd, set := u.User.Password(); set && passwd == PASSWORD { | ||
| if resourceUrl, ok := resource["url"]; ok { | ||
| if r, ok := resourceUrl.(string); ok { | ||
| config["url"] = r | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return config | ||
| } |