2017-05-07 00:10:40 +02:00
package form
2017-05-06 21:21:39 +02:00
import (
"regexp"
2017-05-07 10:25:09 +02:00
2017-05-06 21:21:39 +02:00
"github.com/ewhal/nyaa/util/log"
)
const EMAIL_REGEX = ` (\w[-._\w]*\w@\w[-._\w]*\w\.\w { 2,3}) `
2017-05-07 05:04:55 +02:00
const USERNAME_REGEX = ` (\W) `
2017-05-06 21:21:39 +02:00
2017-05-07 19:59:38 +02:00
func EmailValidation ( email string , err map [ string ] [ ] string ) ( bool , map [ string ] [ ] string ) {
exp , errorRegex := regexp . Compile ( EMAIL_REGEX )
if regexpCompiled := log . CheckError ( errorRegex ) ; regexpCompiled {
2017-05-06 21:21:39 +02:00
if exp . MatchString ( email ) {
2017-05-07 19:59:38 +02:00
return true , err
2017-05-06 21:21:39 +02:00
}
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
}
2017-05-07 20:10:23 +02:00
err [ "email" ] = append ( err [ "email" ] , "Email Address is not valid" )
2017-05-07 19:59:38 +02:00
return false , err
2017-05-06 21:21:39 +02:00
}
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
func ValidateUsername ( username string , err map [ string ] [ ] string ) ( bool , map [ string ] [ ] string ) {
2017-05-07 19:59:38 +02:00
exp , errorRegex := regexp . Compile ( USERNAME_REGEX )
if regexpCompiled := log . CheckError ( errorRegex ) ; regexpCompiled {
2017-05-07 05:04:55 +02:00
if exp . MatchString ( username ) {
2017-05-07 19:59:38 +02:00
err [ "username" ] = append ( err [ "username" ] , "Username contains illegal characters" )
return false , err
2017-05-07 05:04:55 +02:00
}
} else {
2017-05-07 19:59:38 +02:00
return false , err
2017-05-07 05:04:55 +02:00
}
2017-05-07 19:59:38 +02:00
return true , err
}
func NewErrors ( ) map [ string ] [ ] string {
err := make ( map [ string ] [ ] string )
return err
2017-05-07 05:04:55 +02:00
}
2017-05-09 17:47:06 +02:00
func NewInfos ( ) map [ string ] [ ] string {
infos := make ( map [ string ] [ ] string )
return infos
}
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
func IsAgreed ( termsAndConditions string ) bool { // TODO: Inline function
return termsAndConditions == "1"
2017-05-07 16:08:45 +02:00
}
2017-05-06 21:21:39 +02:00
// RegistrationForm is used when creating a user.
type RegistrationForm struct {
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
Username string ` form:"username" needed:"true" len_min:"3" len_max:"20" `
2017-05-10 15:40:23 +02:00
Email string ` form:"email" `
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
Password string ` form:"password" needed:"true" len_min:"6" len_max:"25" equalInput:"ConfirmPassword" `
ConfirmPassword string ` form:"password_confirmation" omit:"true" needed:"true" `
CaptchaID string ` form:"captchaID" omit:"true" needed:"true" `
TermsAndConditions bool ` form:"t_and_c" omit:"true" needed:"true" equal:"true" hum_name:"Terms and Conditions" `
2017-05-06 21:21:39 +02:00
}
2017-05-08 22:12:57 +02:00
// LoginForm is used when a user logs in.
2017-05-06 21:21:39 +02:00
type LoginForm struct {
Consistency, formatting, error checking, cleanup, and a couple bug fixes (#245)
* Checkpoint: it builds
The config, db, model, network, os, and public packages have had some
fixes to glaringly obvious flaws, dead code removed, and stylistic
changes.
* Style changes and old code removal in router
Router needs a lot of work done to its (lack of) error handling.
* Dead code removal and style changes
Now up to util/email/email.go. After I'm finished with the initial sweep
I'll go back and fix error handling and security issues. Then I'll fix
the broken API. Then I'll go through to add documentation and fix code
visibility.
* Finish dead code removal and style changes
Vendored libraries not touched. Everything still needs security fixes
and documentation. There's also one case of broken functionality.
* Fix accidental find-and-replace
* Style, error checking, saftey, bug fix changes
* Redo error checking erased during merge
* Re-add merge-erased fix. Make Safe safe.
2017-05-10 04:34:40 +02:00
Username string ` form:"username" needed:"true" `
Password string ` form:"password" needed:"true" `
2017-05-06 21:21:39 +02:00
}
// UserForm is used when updating a user.
type UserForm struct {
2017-05-10 20:24:37 +02:00
Username string ` form:"username" needed:"true" len_min:"3" len_max:"20" `
2017-05-10 22:42:11 +02:00
Email string ` form:"email" `
2017-05-10 20:24:37 +02:00
Language string ` form:"language" default:"en-us" `
CurrentPassword string ` form:"current_password" len_min:"6" len_max:"25" omit:"true" `
Password string ` form:"password" len_min:"6" len_max:"25" equalInput:"Confirm_Password" `
Confirm_Password string ` form:"password_confirmation" omit:"true" `
Status int ` form:"status" default:"0" `
2017-05-06 21:21:39 +02:00
}
// PasswordForm is used when updating a user password.
type PasswordForm struct {
2017-05-07 14:53:01 +02:00
CurrentPassword string ` form:"currentPassword" `
Password string ` form:"newPassword" `
2017-05-06 21:21:39 +02:00
}
// SendPasswordResetForm is used when sending a password reset token.
type SendPasswordResetForm struct {
2017-05-07 14:53:01 +02:00
Email string ` form:"email" `
2017-05-06 21:21:39 +02:00
}
// PasswordResetForm is used when reseting a password.
type PasswordResetForm struct {
2017-05-07 14:53:01 +02:00
PasswordResetToken string ` form:"token" `
Password string ` form:"newPassword" `
2017-05-06 21:21:39 +02:00
}