You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/03/16 15:01:00 UTC

[airavata-php-gateway] branch develop updated: Adds ampersand to password regex validation

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0923f16  Adds ampersand to password regex validation
     new 5e4d96e  Merge branch 'password-ampersand-validation' into develop
0923f16 is described below

commit 0923f16d121b427c5e707a484a2c1c40647638df
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Mar 16 11:00:31 2018 -0400

    Adds ampersand to password regex validation
---
 app/controllers/AccountController.php | 2 +-
 app/controllers/AdminController.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index d18900c..82864bc 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -2,7 +2,7 @@
 
 class AccountController extends BaseController
 {
-    const PASSWORD_VALIDATION = "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/";
+    const PASSWORD_VALIDATION = "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*&]).*$/";
     const PASSWORD_VALIDATION_MESSAGE = "Password needs to contain at least (a) One lower case letter (b) One Upper case letter and (c) One number (d) One of the following special characters - !@#$&*";
 
     public function __construct()
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 03b67a7..e69c527 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -174,7 +174,7 @@ class AdminController extends BaseController {
 	public function updateGateway(){
 
         $rules = array(
-            "password" => "min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/",
+            "password" => "min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*&]).*$/",
             "confirm_password" => "same:password",
             "email" => "email",
         );
@@ -463,7 +463,7 @@ class AdminController extends BaseController {
 		$inputs = Input::all();
 
 		$rules = array(
-            "password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/",
+            "password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*&]).*$/",
             "confirm_password" => "required|same:password",
             "email" => "required|email",
         );
@@ -547,7 +547,7 @@ class AdminController extends BaseController {
 		
 		$rules = array(
             "username" => "required",
-            "password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/",
+            "password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*&]).*$/",
             "confirm_password" => "required|same:password",
             "email" => "required|email",
         );

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.