diff --git a/API.md b/API.md index bb2f0e5f6398280bd71571fbf059059a15d01c30..0c54fdd6fc6fef2566642c679b79dca3955a2106 100644 --- a/API.md +++ b/API.md @@ -256,7 +256,6 @@ This is an example of a simple user, as returned by `/api/user/get`: "group": "uno", "database": { "db_user": "unodb", - "cleartext_password": "password" } }, { diff --git a/backend/ldap/model_test.go b/backend/ldap/model_test.go index 5a22f3a89342d857026332cbbd67581f2b701765..4002f89ddd344f83c1ac9cbfb7c32e6b3c28cc7f 100644 --- a/backend/ldap/model_test.go +++ b/backend/ldap/model_test.go @@ -116,8 +116,7 @@ func TestModel_GetUser(t *testing.T) { OriginalShard: "host2", Status: as.ResourceStatusActive, Database: &as.Database{ - CleartextPassword: "password", - DBUser: "unodb", + DBUser: "unodb", }, } if err := deep.Equal(db, expectedDB); err != nil { diff --git a/backend/ldap/resources.go b/backend/ldap/resources.go index d35cb4f833840abb00b598a5cf53899bcd7b2593..24d59cb8ddde1b4abbea9409c60ccb8161d90834 100644 --- a/backend/ldap/resources.go +++ b/backend/ldap/resources.go @@ -430,8 +430,7 @@ func (h *databaseResourceHandler) FromLDAP(entry *ldap.Entry) (*as.Resource, err ParentID: as.ResourceID(parentDN), Name: name, Database: &as.Database{ - DBUser: entry.GetAttributeValue("dbuser"), - CleartextPassword: entry.GetAttributeValue("clearPassword"), + DBUser: entry.GetAttributeValue("dbuser"), }, }, nil } @@ -441,7 +440,6 @@ func (h *databaseResourceHandler) ToLDAP(rsrc *as.Resource) []ldap.PartialAttrib {Type: "objectClass", Vals: []string{"top", "dbMysql"}}, {Type: "dbname", Vals: s2l(rsrc.Name)}, {Type: "dbuser", Vals: s2l(rsrc.Database.DBUser)}, - {Type: "clearPassword", Vals: s2l(rsrc.Database.CleartextPassword)}, } } diff --git a/backend/ldap/resources_test.go b/backend/ldap/resources_test.go index 875386c6d8da9c1abcc3e79f708ef696512fdd89..fe7f917188f988d1b3a3bab80080d7990de2e078 100644 --- a/backend/ldap/resources_test.go +++ b/backend/ldap/resources_test.go @@ -108,8 +108,7 @@ func TestResource_LDAPSerialization(t *testing.T) { Name: "testdb", Status: as.ResourceStatusActive, Database: &as.Database{ - DBUser: "testdbuser", - CleartextPassword: "secretpassword", + DBUser: "testdbuser", }, }, diff --git a/types.go b/types.go index 3a924086a7b4786891e0cc05169b0a1295ed1a53..4b87fe0e2027a097d971fd8b69d6960ea9e18ee1 100644 --- a/types.go +++ b/types.go @@ -562,8 +562,7 @@ type Website struct { // Database resource attributes. type Database struct { - DBUser string `json:"db_user"` - CleartextPassword string `json:"cleartext_password"` + DBUser string `json:"db_user"` } // CMSInfo holds CMS-specific information.