From aa2bfac3e51007ab0573edaf84ad09d68cba0b77 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@spacejewel-hosting.com>
Date: Wed, 6 Jan 2021 03:48:14 +0000
Subject: [PATCH] Show current pw policy in register page Also adds a warning
 for when pw policy is set to off

---
 .../Controllers/Auth/RegisterController.php   |  2 +-
 resources/views/auth/register.blade.php       | 66 ++++++++++++-------
 .../administration/settings.blade.php         | 20 ++++++
 3 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 8e8c0cd..41af9f2 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -94,7 +94,7 @@ class RegisterController extends Controller
                 break;
                 
             case 'medium':
-                $password = ['required', 'string', 'confirmed', 'regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[#?!@$%^&*-]).{10,}$/'];
+                $password = ['required', 'string', 'confirmed', 'regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[#?!@$%^&*-]).{12,}$/'];
                 break;
 
             case 'high':
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 299c279..f04ad44 100755
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -14,27 +14,41 @@
                 <img src="{{ config('adminlte.logo_img') }}" alt="logo" class="logo">{{ config('adminlte.logo') }}
               </div> <!-- main content start -->
               <p class="login-card-description">{{__('messages.register_acc')}}</p>
-              <div class="alert alert-warning alert-dismissible">
-                  <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
-                  <p><b>{{__('messages.pwsec.line1')}}</b></p>
-                  <p>{{__('messages.pwsec.line2')}}</p>
+              
+              @if(\App\Facades\Options::getOption('pw_security_policy') !== 'off')
+
+                  <div class="alert alert-warning alert-dismissible">
+                    <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+                    <p><b>{{__('messages.pwsec.line1')}}</b></p>
+                    <p>{{__('messages.pwsec.line2')}}</p>
+
+                    <p>{{__('messages.pwsec.line3')}} </p>
+                    <ul>
+                      @switch(\App\Facades\Options::getOption('pw_security_policy'))
+                        
+                        @case('low')
+                          <li>A minimum of 10 characters</li>
+                          @break
+
+                        @case('medium')
+                          <li>A minimum of 12 characters;</li>
+                          <li>At least one special character;</li>
+                          <li>Lower case and upper case characters</li>
+                          @break  
+
+                        @case('high')
+                          <li>A minimum of 20 characters;</li>
+                          <li>At least one special character;</li>
+                          <li>Lower case and upper case characters</li>
+                          <li>At least one numerical character</li>
+                          @break  
+
+                      @endswitch
+                    </ul>
+                  </div>
+
+              @endif
 
-                  <p>{{__('messages.pwsec.line3')}} </p>
-                  <ul>
-                    <li>
-                      {{__('messages.pwsec.line4')}}
-                    </li>
-                    <li>
-                      {{__('messages.pwsec.line5')}}
-                    </li>
-                    <li>
-                      {{__('messages.pwsec.line6')}}
-                    </li>
-                    <li>
-                      {{__('messages.pwsec.line7')}}
-                    </li>
-                  </ul>
-              </div>
               <form action="{{ route('register') }}" method="POST" id="registerForm">
                   @csrf
                   <div class="form-group">
@@ -54,10 +68,14 @@
                     <input type="password" id="passwordc" name="password_confirmation" class="form-control" placeholder="{{__('messages.sronly_confirmpassword')}}" />
                   </div>
 
-                  <div class="form-group mt-5">
-                    <label for="mcusername" class="sr-only">{{__('messages.sronly_mcusername')}}</label>
-                    <input type="text" name="uuid" class="form-control" id="mcusername" placeholder="{{__('messages.sronly_mcusername')}}" />
-                  </div>
+                  
+                  @if(\App\Facades\Options::getOption('requireGameLicense') && \App\Facades\Options::getOption('currentGame') == 'MINECRAFT')
+                      <div class="form-group mt-5">
+                        <label for="mcusername" class="sr-only">{{__('messages.sronly_mcusername')}}</label>
+                        <input type="text" name="uuid" class="form-control" id="mcusername" placeholder="{{__('messages.sronly_mcusername')}}" />
+                      </div>
+                  @endif
+
                   <input name="register" id="register" class="btn btn-block login-btn mb-4" type="submit" value="{{__('messages.register_txt')}}">
                 </form>
                 <p class="login-card-footer-text">{{__('messages.have_account')}} <a href="{{ route('login') }}" class="text-reset">{{__('messages.login_here')}}</a></p>
diff --git a/resources/views/dashboard/administration/settings.blade.php b/resources/views/dashboard/administration/settings.blade.php
index 39a77ea..8bccefa 100755
--- a/resources/views/dashboard/administration/settings.blade.php
+++ b/resources/views/dashboard/administration/settings.blade.php
@@ -90,6 +90,26 @@
 
     </div>
 
+    @if($security['secPolicy'] == 'off')
+
+        <div class="row">
+
+            <div class="col">
+            
+                <div class="alert alert-danger">
+                
+                    <p><b><i class="fas fa-exclamation-triangle"></i> DANGER: </b> Insecure security policy</p>
+
+                    <p>Your current password security policy is set to <b>off</b>. This allows users to choose potentially unsafe passwords.</p>
+                    <p>We strongly recommend you update this value to <b>Low</b> or <b>Medium</b>.</p>
+                
+                </div>
+
+            </div>
+        
+        </div>
+
+    @endif
 
     <div class="row">