Skip to content

fix: 2471 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 3, 2022
Merged

fix: 2471 #11

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe6de72
password fix
Dec 3, 2022
ddcc130
secret value check
Dec 3, 2022
20bedfa
check for old password
Dec 3, 2022
d7a737c
logs
Dec 3, 2022
69a6cca
check correction
Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions util/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func InitialiseSettings(k8sClient *client.K8sClient) error {
}
var hashedPassword string
newPassword := false
if _, ok := secret.Data[client.SettingAdminPasswordHashKey]; !ok {
if oldPassword, ok := secret.Data[client.ADMIN_PASSWORD]; !ok || len(oldPassword) == 0 {
randBytes := make([]byte, client.InitialPasswordLength)
for i := 0; i < client.InitialPasswordLength; i++ {
num, err := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))
Expand Down Expand Up @@ -123,8 +123,11 @@ func MigrateDexConfigFromAcdToDevtronSecret(k8sClient *client.K8sClient) (bool,
}
}
if _, ok := devtronSecret.Data[client.ADMIN_PASSWORD]; !ok {
devtronSecret.Data[client.ADMIN_PASSWORD] = devtronSecret.Data[client.SettingAdminAcdPasswordKey]
updateRequired = true
oldPassword := devtronSecret.Data[client.SettingAdminAcdPasswordKey]
if len(oldPassword) > 0 {
devtronSecret.Data[client.ADMIN_PASSWORD] = oldPassword
updateRequired = true
}
}

// here create or update devtron secret and migrate and store config for dex
Expand Down