DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-16 07:07:35 -07:00
parent 5ead5a94e3 1fbf3753bc
commit 892c1b04fd
2 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/Http/Controllers/Api/SettingsController.php
View file

@ -5,6 +5,8 @@ namespace App\Http\Controllers\Api;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Ldap; use App\Models\Ldap;
use Validator;
use App\Models\Setting;
class SettingsController extends Controller class SettingsController extends Controller
{ {
@ -78,6 +80,11 @@ class SettingsController extends Controller
public function ldaptest() public function ldaptest()
{ {
if (Setting::getSettings()->ldap_enabled!='1') {
\Log::debug('LDAP is not enabled cannot test.');
return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);
}
\Log::debug('Preparing to test LDAP connection'); \Log::debug('Preparing to test LDAP connection');
try { try {
@ -102,20 +109,37 @@ class SettingsController extends Controller
public function ldaptestlogin(Request $request) public function ldaptestlogin(Request $request)
{ {
\Log::debug('Preparing to test LDAP login'); if (Setting::getSettings()->ldap_enabled!='1') {
\Log::debug('LDAP is not enabled. Cannot test.');
return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);
}
$rules = array(
'ldaptest_user' => 'required',
'ldaptest_password' => 'required'
);
$validator = Validator::make($request->all(), $rules);
if ($validator->fails()) {
\Log::debug('LDAP Validation test failed.');
return response()->json(['message' => $validator->errors()->all()], 400);
}
\Log::debug('Preparing to test LDAP login');
try { try {
$connection = Ldap::connectToLdap(); $connection = Ldap::connectToLdap();
try { try {
\Log::debug('Attempting to bind to LDAP for LDAP test');
Ldap::bindAdminToLdap($connection); Ldap::bindAdminToLdap($connection);
\Log::debug('Attempting to bind to LDAP for LDAP test');
try { try {
$ldap_user = Ldap::findAndBindUserLdap($request->input('ldaptest_user'), $request->input('ldaptest_password')); $ldap_user = Ldap::findAndBindUserLdap($request->input('ldaptest_user'), $request->input('ldaptest_password'));
if ($ldap_user) { if ($ldap_user) {
\Log::debug('It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'); \Log::debug('It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.');
return response()->json(['message' => 'It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 200); return response()->json(['message' => 'It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 200);
} }
return response()->json(['message' => 'Login Failed. '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 400); return response()->json(['message' => 'Login Failed. '. $request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400);
} catch (\Exception $e) { } catch (\Exception $e) {
\Log::debug('LDAP login failed'); \Log::debug('LDAP login failed');

10
resources/views/settings/ldap.blade.php
View file

@ -353,10 +353,10 @@
<div class="col-md-9" id="ldaptestloginrow"> <div class="col-md-9" id="ldaptestloginrow">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<input type="text" name="ldaptest_user" class="form-control" placeholder="LDAP username"> <input type="text" name="ldaptest_user" id="ldaptest_user" class="form-control" placeholder="LDAP username">
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<input type="password" name="ldaptest_password" class="form-control" placeholder="LDAP password"> <input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="LDAP password">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<a class="btn btn-default btn-sm" id="ldaptestlogin" style="margin-right: 10px;">Test LDAP</a> <a class="btn btn-default btn-sm" id="ldaptestlogin" style="margin-right: 10px;">Test LDAP</a>
@ -448,7 +448,11 @@
"X-Requested-With": 'XMLHttpRequest', "X-Requested-With": 'XMLHttpRequest',
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content') "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
}, },
data: {}, data: {
'ldaptest_user': $('#ldaptest_user').val(),
'ldaptest_password': $('#ldaptest_password').val()
},
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {