DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

More AD fixes

Browse source
This commit is contained in:
snipe 2016-07-14 16:27:32 -07:00
parent 0cf8ac1d95
commit 99a42dfc38
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/Models/Ldap.php
View file

@ -62,27 +62,29 @@ class Ldap extends Model
* array of ldap_attributes if $user is true * array of ldap_attributes if $user is true
* *
*/ */
static function findAndBindUserLdap($username, $password) { static function findAndBindUserLdap($username, $password)
{
$settings = Setting::getSettings();
$connection = Ldap::connectToLdap(); $connection = Ldap::connectToLdap();
$ldap_username_field = $settings->ldap_username_field;
$baseDn = $settings->ldap_basedn;
$ldap_username_field = Setting::getSettings()->ldap_username_field; if ($settings->is_ad =='1')
$baseDn = Setting::getSettings()->ldap_basedn; {
if (Setting::getSettings()->is_ad=='1') {
// In case they haven't added an AD domain // In case they haven't added an AD domain
if (Setting::getSettings()->ad_domain='') { if ($settings->ad_domain ='') {
$userDn = $username.'@'.Setting::getSettings()->email_domain; $userDn = $username.'@'.$settings->email_domain;
} else { } else {
$userDn = $username.'@'.Setting::getSettings()->ad_domain; $userDn = $username.'@'.$settings->ad_domain;
} }
} else { } else {
$userDn = $ldap_username_field.'='.$username.','.Setting::getSettings()->ldap_basedn; $userDn = $ldap_username_field.'='.$username.','.$settings->ldap_basedn;
} }
$filterQuery = Setting::getSettings()->ldap_auth_filter_query . $username;
$filterQuery = $settings->ldap_auth_filter_query . $username;
if (!$ldapbind = @ldap_bind($connection, $userDn, $password)) { if (!$ldapbind = @ldap_bind($connection, $userDn, $password)) {
return false; return false;
@ -116,7 +118,8 @@ class Ldap extends Model
* false if the username and/or password provided are invalid * false if the username and/or password provided are invalid
* *
*/ */
static function bindAdminToLdap($connection) { static function bindAdminToLdap($connection)
{
$ldap_username = Setting::getSettings()->ldap_uname; $ldap_username = Setting::getSettings()->ldap_uname;

2
database/migrations/2016_07_14_153609_add_ad_domain_to_settings.php
View file

@ -13,7 +13,7 @@ class AddAdDomainToSettings extends Migration
public function up() public function up()
{ {
Schema::table('settings', function (Blueprint $table) { Schema::table('settings', function (Blueprint $table) {
$table->text('ad_domain')->nullable()->default(NULL); $table->string('ad_domain')->nullable()->default(NULL);
}); });
} }

4
resources/views/settings/edit.blade.php
View file

@ -694,13 +694,13 @@
<!-- AD Domain --> <!-- AD Domain -->
<div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('ldap_server', trans('admin/settings/general.ad_domain')) }} {{ Form::label('ad_domain', trans('admin/settings/general.ad_domain')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
{{ Form::text('ad_domain', Input::old('ad_domain', $setting->ad_domain), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'example.com')) }} {{ Form::text('ad_domain', Input::old('ad_domain', $setting->ad_domain), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'example.com')) }}
@else @else
{{ Form::text('ad_domain', Input::old('ldap_server', $setting->ad_domain), array('class' => 'form-control','placeholder' => 'example.com')) }} {{ Form::text('ad_domain', Input::old('ad_domain', $setting->ad_domain), array('class' => 'form-control','placeholder' => 'example.com')) }}
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p>