cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use more descriptive variable names in auth.go

pull/186/head
Rob Cutmore 2016-03-02 19:59:40 -05:00
parent e39ae8dfdd
commit a5a7b23479
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
auth/auth.go
View File

@ -60,8 +60,8 @@ func Login(r *http.Request) (bool, error) {
// Register attempts to register the user given a request. // Register attempts to register the user given a request.
func Register(r *http.Request) (bool, error) { func Register(r *http.Request) (bool, error) {
username := r.FormValue("username") username := r.FormValue("username")
password1 := r.FormValue("password") newPassword := r.FormValue("password")
password2 := r.FormValue("confirm_password") confirmPassword := r.FormValue("confirm_password")
u, err := models.GetUserByUsername(username) u, err := models.GetUserByUsername(username)
// If we have an error which is not simply indicating that no user was found, report it // If we have an error which is not simply indicating that no user was found, report it
if err != nil { if err != nil {
@ -71,15 +71,15 @@ func Register(r *http.Request) (bool, error) {
u = models.User{} u = models.User{}
// If we've made it here, we should have a valid username given // If we've made it here, we should have a valid username given
// Check that the passsword isn't blank // Check that the passsword isn't blank
if password1 == "" { if newPassword == "" {
return false, ErrEmptyPassword return false, ErrEmptyPassword
} }
// Make sure passwords match // Make sure passwords match
if password1 != password2 { if newPassword != confirmPassword {
return false, ErrPasswordMismatch return false, ErrPasswordMismatch
} }
// Let's create the password hash // Let's create the password hash
h, err := bcrypt.GenerateFromPassword([]byte(password1), bcrypt.DefaultCost) h, err := bcrypt.GenerateFromPassword([]byte(newPassword), bcrypt.DefaultCost)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -102,23 +102,23 @@ func GenerateSecureKey() string {
func ChangePassword(r *http.Request) error { func ChangePassword(r *http.Request) error {
u := ctx.Get(r, "user").(models.User) u := ctx.Get(r, "user").(models.User)
currentPw := r.FormValue("current_password") currentPw := r.FormValue("current_password")
pw1 := r.FormValue("new_password") newPassword := r.FormValue("new_password")
pw2 := r.FormValue("confirm_new_password") confirmPassword := r.FormValue("confirm_new_password")
// Check the current password // Check the current password
err := bcrypt.CompareHashAndPassword([]byte(u.Hash), []byte(currentPw)) err := bcrypt.CompareHashAndPassword([]byte(u.Hash), []byte(currentPw))
if err != nil { if err != nil {
return ErrInvalidPassword return ErrInvalidPassword
} }
// Check that the new password isn't blank // Check that the new password isn't blank
if pw1 == "" { if newPassword == "" {
return ErrEmptyPassword return ErrEmptyPassword
} }
// Check that new passwords match // Check that new passwords match
if pw1 != pw2 { if newPassword != confirmPassword {
return ErrPasswordMismatch return ErrPasswordMismatch
} }
// Generate the new hash // Generate the new hash
h, err := bcrypt.GenerateFromPassword([]byte(pw1), bcrypt.DefaultCost) h, err := bcrypt.GenerateFromPassword([]byte(newPassword), bcrypt.DefaultCost)
if err != nil { if err != nil {
return err return err
} }