Skip to content

Remove 'md5Hashed' variable from Javascript. #2555

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
DaanHoogland merged 1 commit into from
Apr 13, 2018
Merged

Remove 'md5Hashed' variable from Javascript. #2555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions ui/scripts/accounts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,9 +1359,6 @@
};

var password = args.data.password;
if (md5Hashed) {
password = $.md5(password);
}
$.extend(data, {
password: password
});
Expand Down Expand Up @@ -1502,9 +1499,6 @@

var password = args.data.newPassword;

if (md5Hashed)
password = $.md5(password);

$.ajax({
url: createURL('updateUser'),
data: {
Expand Down
12 changes: 2 additions & 10 deletions ui/scripts/accountsWizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,20 +205,12 @@
}

if (!ldapStatus) {
var password = args.data.password;
if (md5Hashed) {
password = $.md5(password);
}
array1.push("&email=" + args.data.email);
array1.push("&firstname=" + args.data.firstname);
array1.push("&lastname=" + args.data.lastname);

password = args.data.password;
if (md5Hashed) {
password = $.md5(password);
} else {
password = todb(password);
}
var password = args.data.password;
password = todb(password);
array1.push("&password=" + password);
}

Expand Down
6 changes: 1 addition & 5 deletions ui/scripts/cloudStack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,7 @@
var array1 = [];
array1.push("&username=" + encodeURIComponent(args.data.username));

var password;
if (md5HashedLogin)
password = $.md5(args.data.password);
else
password = todb(args.data.password);
var password = todb(args.data.password);
array1.push("&password=" + password);

var domain;
Expand Down
2 changes: 1 addition & 1 deletion ui/scripts/installWizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
url: createURL('updateUser'),
data: {
id: cloudStack.context.users[0].userid,
password: md5Hashed ? $.md5(args.data.password) : args.data.password
password: args.data.password
},
type: 'POST',
dataType: 'json',
Expand Down
4 changes: 0 additions & 4 deletions ui/scripts/sharedFunctions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ var ERROR_INTERNET_NAME_NOT_RESOLVED = 12007;
var ERROR_INTERNET_CANNOT_CONNECT = 12029;
var ERROR_VMOPS_ACCOUNT_ERROR = 531;

// Default password is MD5 hashed. Set the following variable to false to disable this.
var md5Hashed = false;

@yadvr yadvr Apr 9, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rafaelweingartner while this PR LGTM, we may need to discuss with user/dev@ as this variable may be set by a UI plugin that is not opensource or with the upstream tree? Certain parts of the code may exist and appear to be not used at all, but may be used by an external UI/backend plugin.

@rafaelweingartner rafaelweingartner Apr 9, 2018

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will ask people in the mailing list then. If there is no objections there, I think we can proceed.

var md5HashedLogin = false;

//page size for API call (e.g."listXXXXXXX&pagesize=N" )
var pageSize = 20;
//var pageSize = 1; //for testing only
Expand Down