fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 9894 Active Directory User Import not working SOLVED

Browse Source 
- Fields deprecated and wrong default filter for the ldap class
- Those parameters are not used, now it is only used the additional filter, with this field you can create the same filters or more complex filters.

Also, we've detected that the filter by default we are using the following condition: (objectCategory=person)

So, your filter is not working anymore, now we have been removed that condition to search in all objects and if you want to limit the objects on which searches can be done, you have to add your own filter.
This commit is contained in:
Julio Cesar Laura
2012-11-27 16:32:20 -04:00
parent 86087f7993
commit 6d7c9f5da7
3 changed files with 60 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rbac/engine/classes/plugins/class.ldap.php
View File

@@ -148,9 +148,9 @@ class LDAP
} }
} }
$sFilter = '(&(|(objectClass=*))'; $sFilter = '(&(|(objectClass=*))';
if ( isset( $aAuthSource['AUTH_SOURCE_DATA']['LDAP_TYPE']) && $aAuthSource['AUTH_SOURCE_DATA']['LDAP_TYPE'] == 'ad' ) { if ( isset( $aAuthSource['AUTH_SOURCE_DATA']['LDAP_TYPE']) && $aAuthSource['AUTH_SOURCE_DATA']['LDAP_TYPE'] == 'ad' ) {
$sFilter = "(&(|(objectClass=*))(|(samaccountname=$sKeyword)(userprincipalname=$sKeyword))(objectCategory=person))"; $sFilter = "(&(|(objectClass=*))(|(samaccountname=$sKeyword)(userprincipalname=$sKeyword)))";
} }
else else
$sFilter = "(&(|(objectClass=*))(|(uid=$sKeyword)(cn=$sKeyword)))"; $sFilter = "(&(|(objectClass=*))(|(uid=$sKeyword)(cn=$sKeyword)))";
@@ -158,7 +158,7 @@ class LDAP
//G::pr($sFilter); //G::pr($sFilter);
$aUsers = array(); $aUsers = array();
$oSearch = @ldap_search($oLink, $aAuthSource['AUTH_SOURCE_BASE_DN'], $sFilter, array('dn','uid','samaccountname', 'cn','givenname','sn','mail','userprincipalname','objectcategory', 'manager')); $oSearch = @ldap_search($oLink, $aAuthSource['AUTH_SOURCE_BASE_DN'], $sFilter, array('dn','uid','samaccountname', 'cn','givenname','sn','mail','userprincipalname','objectcategory', 'manager'));
if ($oError = @ldap_errno($oLink)) { if ($oError = @ldap_errno($oLink)) {
return $aUsers; return $aUsers;
} }
@@ -179,7 +179,7 @@ class LDAP
'sFirstname' => isset($aAttr['givenname']) ? $aAttr['givenname'] : '', 'sFirstname' => isset($aAttr['givenname']) ? $aAttr['givenname'] : '',
'sLastname' => isset($aAttr['sn']) ? $aAttr['sn'] : '', 'sLastname' => isset($aAttr['sn']) ? $aAttr['sn'] : '',
'sEmail' => isset($aAttr['mail']) ? $aAttr['mail'] : ( isset($aAttr['userprincipalname'])?$aAttr['userprincipalname'] : '') , 'sEmail' => isset($aAttr['mail']) ? $aAttr['mail'] : ( isset($aAttr['userprincipalname'])?$aAttr['userprincipalname'] : '') ,
'sDN' => $aAttr['dn'] ); 'sDN' => $aAttr['dn'] );
} }
} while ($oEntry = @ldap_next_entry($oLink, $oEntry)); } while ($oEntry = @ldap_next_entry($oLink, $oEntry));
} }

110
workflow/engine/templates/authSources/authSourcesEdit.js
View File

@@ -37,7 +37,7 @@ Ext.onReady(function(){
hiddenName: 'LDAP_TYPE', hiddenName: 'LDAP_TYPE',
store: new Ext.data.SimpleStore({ store: new Ext.data.SimpleStore({
fields: ['ldap','ad'], fields: ['ldap','ad'],
data : my_values data : my_values
}), }),
displayField: 'ldap', displayField: 'ldap',
typeAhead: true, typeAhead: true,
@@ -48,10 +48,8 @@ Ext.onReady(function(){
listeners:{ listeners:{
select: function(c,d,i){ select: function(c,d,i){
if(i){ if(i){
formAuthSourceE.getForm().findField('AUTH_SOURCE_ATTRIBUTES').setValue('cn' + "\n" + 'samaccountname' + "\n" + 'givenname' + "\n" + 'sn' + "\n" + 'userprincipalname' + "\n" + 'telephonenumber');
formAuthSourceE.getForm().findField('AUTH_SOURCE_IDENTIFIER_FOR_USER').setValue('samaccountname'); formAuthSourceE.getForm().findField('AUTH_SOURCE_IDENTIFIER_FOR_USER').setValue('samaccountname');
} else { } else {
formAuthSourceE.getForm().findField('AUTH_SOURCE_ATTRIBUTES').setValue('cn' + "\n" + 'uid' + "\n" + 'givenname' + "\n" + 'sn' + "\n" + 'mail' + "\n" + 'mobile');
formAuthSourceE.getForm().findField('AUTH_SOURCE_IDENTIFIER_FOR_USER').setValue('uid'); formAuthSourceE.getForm().findField('AUTH_SOURCE_IDENTIFIER_FOR_USER').setValue('uid');
} }
} }
@@ -59,8 +57,8 @@ Ext.onReady(function(){
}); });
var txtServerName=new Ext.form.TextField({ var txtServerName=new Ext.form.TextField({
id: 'AUTH_SOURCE_SERVER_NAME', id: 'AUTH_SOURCE_SERVER_NAME',
fieldLabel: _('ID_SERVER_NAME'), fieldLabel: _('ID_SERVER_NAME'),
xtype:'textfield', xtype:'textfield',
value:'', value:'',
width: 200, width: 200,
@@ -75,8 +73,8 @@ Ext.onReady(function(){
}); });
var txtPort=new Ext.form.TextField({ var txtPort=new Ext.form.TextField({
id: 'AUTH_SOURCE_PORT', id: 'AUTH_SOURCE_PORT',
fieldLabel: _('ID_PORT'), fieldLabel: _('ID_PORT'),
xtype:'textfield', xtype:'textfield',
value:'389', value:'389',
width: 200, width: 200,
@@ -123,11 +121,11 @@ Ext.onReady(function(){
var txtBaseDN=new Ext.form.TextField({ var txtBaseDN=new Ext.form.TextField({
id: 'AUTH_SOURCE_BASE_DN', id: 'AUTH_SOURCE_BASE_DN',
fieldLabel: _('ID_BASE_DN'), fieldLabel: _('ID_BASE_DN'),
xtype:'textfield', xtype:'textfield',
value:sUID, value:sUID,
width: 200, width: 300,
autoCreate: {tag: 'input', type: 'text', size: '10', autocomplete: 'off', maxlength: '128'}, autoCreate: {tag: 'input', type: 'text', size: '10', autocomplete: 'off', maxlength: '128'},
allowBlank: false, allowBlank: false,
listeners: { listeners: {
@@ -163,20 +161,20 @@ Ext.onReady(function(){
Ext.getCmp("AUTH_SOURCE_PASSWORD").show(); Ext.getCmp("AUTH_SOURCE_PASSWORD").show();
txtPassword.getEl().up('.x-form-item').setDisplayed(true); txtPassword.getEl().up('.x-form-item').setDisplayed(true);
}else{ }else{
Ext.getCmp("AUTH_SOURCE_SEARCH_USER").disable(); Ext.getCmp("AUTH_SOURCE_SEARCH_USER").disable();
Ext.getCmp("AUTH_SOURCE_SEARCH_USER").hide(); Ext.getCmp("AUTH_SOURCE_SEARCH_USER").hide();
txtSearchUser.getEl().up('.x-form-item').setDisplayed(false); txtSearchUser.getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp("AUTH_SOURCE_PASSWORD").disable(); Ext.getCmp("AUTH_SOURCE_PASSWORD").disable();
Ext.getCmp("AUTH_SOURCE_PASSWORD").hide(); Ext.getCmp("AUTH_SOURCE_PASSWORD").hide();
txtPassword.getEl().up('.x-form-item').setDisplayed(false); txtPassword.getEl().up('.x-form-item').setDisplayed(false);
} }
} }
} }
}); });
var txtSearchUser=new Ext.form.TextField({ var txtSearchUser=new Ext.form.TextField({
id: 'AUTH_SOURCE_SEARCH_USER', id: 'AUTH_SOURCE_SEARCH_USER',
fieldLabel: _('ID_SEARCH_USER'), fieldLabel: _('ID_SEARCH_USER'),
xtype:'textfield', xtype:'textfield',
value:'', value:'',
width: 200, width: 200,
@@ -191,7 +189,7 @@ Ext.onReady(function(){
var txtPassword=new Ext.form.TextField({ var txtPassword=new Ext.form.TextField({
id: 'AUTH_SOURCE_PASSWORD', id: 'AUTH_SOURCE_PASSWORD',
fieldLabel: _('ID_CACHE_PASSWORD'), fieldLabel: _('ID_CACHE_PASSWORD'),
xtype:'textfield', xtype:'textfield',
inputType:'password', inputType:'password',
value:'', value:'',
@@ -208,7 +206,7 @@ Ext.onReady(function(){
//Identifier for an imported user //Identifier for an imported user
var txtIdentifier=new Ext.form.TextField({ var txtIdentifier=new Ext.form.TextField({
id: 'AUTH_SOURCE_IDENTIFIER_FOR_USER', id: 'AUTH_SOURCE_IDENTIFIER_FOR_USER',
fieldLabel: _('ID_IDENTIFIER_IMPORT_USER'), fieldLabel: _('ID_IDENTIFIER_IMPORT_USER'),
xtype:'textfield', xtype:'textfield',
value:'', value:'',
width: 200, width: 200,
@@ -221,28 +219,13 @@ Ext.onReady(function(){
} }
} }
}); });
//Object Classes
var txtaClass=new Ext.form.TextArea({
id: 'AUTH_SOURCE_OBJECT_CLASSES',
fieldLabel: _('ID_OBJECT_CLASS'),
xtype:'textarea',
value:'*',
width: 200,
allowBlank: false,
listeners: {
'render': function(c) {
c.getEl().on('keyup', function() {
}, c);
}
}
});
//Additional Filter //Additional Filter
var txtoAddFilter=new Ext.form.TextField({ var txtoAddFilter=new Ext.form.TextField({
id: 'AUTH_SOURCE_ADDITIONAL_FILTER', id: 'AUTH_SOURCE_ADDITIONAL_FILTER',
fieldLabel: _('ID_ADDITIONAL_FILTER'), fieldLabel: _('ID_ADDITIONAL_FILTER'),
xtype:'textfield', xtype:'textfield',
value:'', value:'',
width: 200, width: 300,
autoCreate: {tag: 'input', type: 'text', size: '20', autocomplete: 'off', maxlength: '200'}, autoCreate: {tag: 'input', type: 'text', size: '20', autocomplete: 'off', maxlength: '200'},
allowBlank: true, allowBlank: true,
listeners: { listeners: {
@@ -252,21 +235,6 @@ Ext.onReady(function(){
} }
} }
}); });
//Attributes
var txtAttributes=new Ext.form.TextArea({
id: 'AUTH_SOURCE_ATTRIBUTES',
fieldLabel: _('ID_ATTRIBUTES'),
xtype:'textArea',
value:'cn' + "\n" + 'uid' + "\n" + 'givenname' + "\n" + 'sn' + "\n" + 'mail' + "\n" + 'mobile',
width: 200,
allowBlank: false,
listeners: {
'render': function(c) {
c.getEl().on('keyup', function() {
}, c);
}
}
});
//here we are setting the fields //here we are setting the fields
fieldsAS = new Ext.form.FieldSet({ fieldsAS = new Ext.form.FieldSet({
title: _('ID_AUTHENTICATION_SOURCE_INF_TITLE'), title: _('ID_AUTHENTICATION_SOURCE_INF_TITLE'),
@@ -274,7 +242,7 @@ Ext.onReady(function(){
txtSourceId, txtSourceId,
txtName, txtName,
cboxType, cboxType,
txtServerName, txtServerName,
txtPort, txtPort,
cboxTLS, cboxTLS,
cboxVersion, cboxVersion,
@@ -283,14 +251,12 @@ Ext.onReady(function(){
txtSearchUser, txtSearchUser,
txtPassword , txtPassword ,
txtIdentifier, txtIdentifier,
txtaClass,
txtoAddFilter, txtoAddFilter,
txtAttributes ]
]
}); });
formAuthSourceE = new Ext.FormPanel({ formAuthSourceE = new Ext.FormPanel({
id:'formAuthSourceE', id:'formAuthSourceE',
labelWidth: 250, labelWidth: 250,
labelAlign:'right', labelAlign:'right',
autoScroll: true, autoScroll: true,
@@ -304,7 +270,7 @@ Ext.onReady(function(){
allowBlank: false, allowBlank: false,
resizable: true, resizable: true,
msgTarget: 'side', msgTarget: 'side',
align:'center' align:'center'
}, },
items:[ items:[
fieldsAS fieldsAS
@@ -312,19 +278,19 @@ Ext.onReady(function(){
buttons: [ buttons: [
{ {
text: _('ID_SAVE'), text: _('ID_SAVE'),
handler: saveAuthSources handler: saveAuthSources
}, },
{ {
text: _('ID_CANCEL'), text: _('ID_CANCEL'),
handler: goback handler: goback
} }
] ]
}); });
formAuthSourceE.render(document.body); formAuthSourceE.render(document.body);
loadAuthSourceData(sUID, txtSearchUser, txtPassword); loadAuthSourceData(sUID, txtSearchUser, txtPassword);
}); });
function goback(){ function goback(){
window.location = 'authSources_List'; window.location = 'authSources_List';
@@ -334,7 +300,7 @@ Ext.onReady(function(){
url: '../adminProxy/saveAuthSources', url: '../adminProxy/saveAuthSources',
params: { params: {
// action : 'tryit', // action : 'tryit',
AUTH_SOURCE_UID: formAuthSourceE.getForm().findField('AUTH_SOURCE_UID').getValue(), AUTH_SOURCE_UID: formAuthSourceE.getForm().findField('AUTH_SOURCE_UID').getValue(),
AUTH_SOURCE_NAME: formAuthSourceE.getForm().findField('AUTH_SOURCE_NAME').getValue(), AUTH_SOURCE_NAME: formAuthSourceE.getForm().findField('AUTH_SOURCE_NAME').getValue(),
LDAP_TYPE: formAuthSourceE.getForm().findField('LDAP_TYPE').getValue(), LDAP_TYPE: formAuthSourceE.getForm().findField('LDAP_TYPE').getValue(),
AUTH_SOURCE_SERVER_NAME: formAuthSourceE.getForm().findField('AUTH_SOURCE_SERVER_NAME').getValue(), AUTH_SOURCE_SERVER_NAME: formAuthSourceE.getForm().findField('AUTH_SOURCE_SERVER_NAME').getValue(),
@@ -344,14 +310,12 @@ Ext.onReady(function(){
AUTH_SOURCE_SEARCH_USER: formAuthSourceE.getForm().findField('AUTH_SOURCE_SEARCH_USER').getValue(), AUTH_SOURCE_SEARCH_USER: formAuthSourceE.getForm().findField('AUTH_SOURCE_SEARCH_USER').getValue(),
AUTH_SOURCE_PASSWORD: formAuthSourceE.getForm().findField('AUTH_SOURCE_PASSWORD').getValue(), AUTH_SOURCE_PASSWORD: formAuthSourceE.getForm().findField('AUTH_SOURCE_PASSWORD').getValue(),
AUTH_SOURCE_VERSION: formAuthSourceE.getForm().findField('AUTH_SOURCE_VERSION').getValue(), AUTH_SOURCE_VERSION: formAuthSourceE.getForm().findField('AUTH_SOURCE_VERSION').getValue(),
AUTH_SOURCE_BASE_DN: formAuthSourceE.getForm().findField('AUTH_SOURCE_BASE_DN').getValue(), AUTH_SOURCE_BASE_DN: formAuthSourceE.getForm().findField('AUTH_SOURCE_BASE_DN').getValue()
AUTH_SOURCE_OBJECT_CLASSES: formAuthSourceE.getForm().findField('AUTH_SOURCE_OBJECT_CLASSES').getValue(),
AUTH_SOURCE_ATTRIBUTES: formAuthSourceE.getForm().findField('AUTH_SOURCE_ATTRIBUTES').getValue()
}, },
waitMsg : 'testing...', waitMsg : _('ID_SAVING'),
timeout : 3600, timeout : 3600,
success: function(f,a){ success: function(f,a){
resp = Ext.util.JSON.decode(a.response.responseText); resp = Ext.util.JSON.decode(a.response.responseText);
if (resp.success){ if (resp.success){
window.location = 'authSources_List'; window.location = 'authSources_List';
@@ -367,7 +331,7 @@ Ext.onReady(function(){
} }
}); });
} }
// Load authosource data for the Edit mode // Load authosource data for the Edit mode
function loadAuthSourceData(sUID, txtSearchUser, txtPassword){ function loadAuthSourceData(sUID, txtSearchUser, txtPassword){
Ext.Ajax.request({ Ext.Ajax.request({
@@ -376,7 +340,7 @@ function loadAuthSourceData(sUID, txtSearchUser, txtPassword){
'action': 'loadauthSourceData', 'action': 'loadauthSourceData',
sUID:sUID sUID:sUID
}, },
waitMsg: _('ID_UPLOADING_PROCESS_FILE'), waitMsg: _('ID_UPLOADING_PROCESS_FILE'),
success: function(r,o){ success: function(r,o){
var data = Ext.util.JSON.decode(r.responseText); var data = Ext.util.JSON.decode(r.responseText);
@@ -388,16 +352,16 @@ function loadAuthSourceData(sUID, txtSearchUser, txtPassword){
Ext.getCmp("AUTH_SOURCE_PASSWORD").show(); Ext.getCmp("AUTH_SOURCE_PASSWORD").show();
txtPassword.getEl().up('.x-form-item').setDisplayed(true); txtPassword.getEl().up('.x-form-item').setDisplayed(true);
}else{ }else{
Ext.getCmp("AUTH_SOURCE_SEARCH_USER").disable(); Ext.getCmp("AUTH_SOURCE_SEARCH_USER").disable();
Ext.getCmp("AUTH_SOURCE_SEARCH_USER").hide(); Ext.getCmp("AUTH_SOURCE_SEARCH_USER").hide();
txtSearchUser.getEl().up('.x-form-item').setDisplayed(false); txtSearchUser.getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp("AUTH_SOURCE_PASSWORD").disable(); Ext.getCmp("AUTH_SOURCE_PASSWORD").disable();
Ext.getCmp("AUTH_SOURCE_PASSWORD").hide(); Ext.getCmp("AUTH_SOURCE_PASSWORD").hide();
txtPassword.getEl().up('.x-form-item').setDisplayed(false); txtPassword.getEl().up('.x-form-item').setDisplayed(false);
} }
Ext.getCmp('formAuthSourceE').getForm().setValues({ Ext.getCmp('formAuthSourceE').getForm().setValues({
AUTH_SOURCE_UID: data.sources.AUTH_SOURCE_UID, AUTH_SOURCE_UID: data.sources.AUTH_SOURCE_UID,
AUTH_SOURCE_NAME: data.sources.AUTH_SOURCE_NAME , AUTH_SOURCE_NAME: data.sources.AUTH_SOURCE_NAME ,
LDAP_TYPE: (data.sources.LDAP_TYPE=='ad')?'Active Directory':data.sources.LDAP_TYPE, LDAP_TYPE: (data.sources.LDAP_TYPE=='ad')?'Active Directory':data.sources.LDAP_TYPE,
@@ -410,8 +374,6 @@ function loadAuthSourceData(sUID, txtSearchUser, txtPassword){
AUTH_SOURCE_IDENTIFIER_FOR_USER: data.sources.AUTH_SOURCE_IDENTIFIER_FOR_USER, AUTH_SOURCE_IDENTIFIER_FOR_USER: data.sources.AUTH_SOURCE_IDENTIFIER_FOR_USER,
AUTH_SOURCE_VERSION: data.sources.AUTH_SOURCE_VERSION, AUTH_SOURCE_VERSION: data.sources.AUTH_SOURCE_VERSION,
AUTH_SOURCE_BASE_DN: data.sources.AUTH_SOURCE_BASE_DN, AUTH_SOURCE_BASE_DN: data.sources.AUTH_SOURCE_BASE_DN,
AUTH_SOURCE_OBJECT_CLASSES: data.sources.AUTH_SOURCE_OBJECT_CLASSES,
AUTH_SOURCE_ATTRIBUTES:data.sources.AUTH_SOURCE_ATTRIBUTES,
AUTH_SOURCE_ADDITIONAL_FILTER:data.sources.AUTH_SOURCE_ADDITIONAL_FILTER AUTH_SOURCE_ADDITIONAL_FILTER:data.sources.AUTH_SOURCE_ADDITIONAL_FILTER
}) })
}, },

76
workflow/engine/templates/authSources/authSourceskindof.js
View File

@@ -47,7 +47,7 @@ Ext.onReady(function(){
hiddenName: 'LDAP_TYPE', hiddenName: 'LDAP_TYPE',
store: new Ext.data.SimpleStore({ store: new Ext.data.SimpleStore({
fields: ['ldap','ad'], fields: ['ldap','ad'],
data : my_values data : my_values
}), }),
displayField: 'ldap', displayField: 'ldap',
typeAhead: true, typeAhead: true,
@@ -59,10 +59,8 @@ Ext.onReady(function(){
listeners:{ listeners:{
select: function(c,d,i){ select: function(c,d,i){
if(i){ if(i){
formAuthSource.getForm().findField('AUTH_SOURCE_ATTRIBUTES').setValue('cn' + "\n" + 'samaccountname' + "\n" + 'givenname' + "\n" + 'sn' + "\n" + 'userprincipalname' + "\n" + 'telephonenumber');
formAuthSource.getForm().findField('AUTH_SOURCE_IDENTIFIER_FOR_USER').setValue('samaccountname'); formAuthSource.getForm().findField('AUTH_SOURCE_IDENTIFIER_FOR_USER').setValue('samaccountname');
} else { } else {
formAuthSource.getForm().findField('AUTH_SOURCE_ATTRIBUTES').setValue('cn' + "\n" + 'uid' + "\n" + 'givenname' + "\n" + 'sn' + "\n" + 'mail' + "\n" + 'mobile');
formAuthSource.getForm().findField('AUTH_SOURCE_IDENTIFIER_FOR_USER').setValue('uid'); formAuthSource.getForm().findField('AUTH_SOURCE_IDENTIFIER_FOR_USER').setValue('uid');
} }
} }
@@ -71,7 +69,7 @@ Ext.onReady(function(){
var txtServerName=new Ext.form.TextField({ var txtServerName=new Ext.form.TextField({
id: 'AUTH_SOURCE_SERVER_NAME', id: 'AUTH_SOURCE_SERVER_NAME',
fieldLabel: _('ID_SERVER_NAME'), fieldLabel: _('ID_SERVER_NAME'),
xtype:'textfield', xtype:'textfield',
value:'', value:'',
width: 200, width: 200,
@@ -87,7 +85,7 @@ Ext.onReady(function(){
var txtPort=new Ext.form.TextField({ var txtPort=new Ext.form.TextField({
id: 'AUTH_SOURCE_PORT', id: 'AUTH_SOURCE_PORT',
fieldLabel: _('ID_PORT'), fieldLabel: _('ID_PORT'),
xtype:'textfield', xtype:'textfield',
value:'389', value:'389',
width: 200, width: 200,
@@ -143,7 +141,7 @@ Ext.onReady(function(){
fieldLabel: _('ID_BASE_DN'), fieldLabel: _('ID_BASE_DN'),
xtype:'textfield', xtype:'textfield',
value:'', value:'',
width: 200, width: 300,
autoCreate: {tag: 'input', type: 'text', size: '10', autocomplete: 'off', maxlength: '128'}, autoCreate: {tag: 'input', type: 'text', size: '10', autocomplete: 'off', maxlength: '128'},
allowBlank: false, allowBlank: false,
listeners: { listeners: {
@@ -181,20 +179,20 @@ Ext.onReady(function(){
Ext.getCmp("AUTH_SOURCE_PASSWORD").show(); Ext.getCmp("AUTH_SOURCE_PASSWORD").show();
txtPassword.getEl().up('.x-form-item').setDisplayed(true); txtPassword.getEl().up('.x-form-item').setDisplayed(true);
}else{ }else{
Ext.getCmp("AUTH_SOURCE_SEARCH_USER").disable(); Ext.getCmp("AUTH_SOURCE_SEARCH_USER").disable();
Ext.getCmp("AUTH_SOURCE_SEARCH_USER").hide(); Ext.getCmp("AUTH_SOURCE_SEARCH_USER").hide();
txtSearchUser.getEl().up('.x-form-item').setDisplayed(false); txtSearchUser.getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp("AUTH_SOURCE_PASSWORD").disable(); Ext.getCmp("AUTH_SOURCE_PASSWORD").disable();
Ext.getCmp("AUTH_SOURCE_PASSWORD").hide(); Ext.getCmp("AUTH_SOURCE_PASSWORD").hide();
txtPassword.getEl().up('.x-form-item').setDisplayed(false); txtPassword.getEl().up('.x-form-item').setDisplayed(false);
} }
} }
} }
}); });
var txtSearchUser=new Ext.form.TextField({ var txtSearchUser=new Ext.form.TextField({
id: 'AUTH_SOURCE_SEARCH_USER', id: 'AUTH_SOURCE_SEARCH_USER',
fieldLabel: _('ID_SEARCH_USER'), fieldLabel: _('ID_SEARCH_USER'),
xtype:'textfield', xtype:'textfield',
value:'', value:'',
width: 200, width: 200,
@@ -209,7 +207,7 @@ Ext.onReady(function(){
var txtPassword=new Ext.form.TextField({ var txtPassword=new Ext.form.TextField({
id: 'AUTH_SOURCE_PASSWORD', id: 'AUTH_SOURCE_PASSWORD',
fieldLabel: _('ID_CACHE_PASSWORD'), fieldLabel: _('ID_CACHE_PASSWORD'),
xtype:'textfield', xtype:'textfield',
inputType:'password', inputType:'password',
value:'', value:'',
@@ -226,7 +224,7 @@ Ext.onReady(function(){
//Identifier for an imported user //Identifier for an imported user
var txtIdentifier=new Ext.form.TextField({ var txtIdentifier=new Ext.form.TextField({
id: 'AUTH_SOURCE_IDENTIFIER_FOR_USER', id: 'AUTH_SOURCE_IDENTIFIER_FOR_USER',
fieldLabel: _('ID_IDENTIFIER_IMPORT_USER'), fieldLabel: _('ID_IDENTIFIER_IMPORT_USER'),
xtype:'textfield', xtype:'textfield',
value:'uid', value:'uid',
width: 200, width: 200,
@@ -239,28 +237,13 @@ Ext.onReady(function(){
} }
} }
}); });
//Object Classes
var txtaClass=new Ext.form.TextArea({
id: 'AUTH_SOURCE_OBJECT_CLASSES',
fieldLabel: _('ID_OBJECT_CLASS'),
xtype:'textarea',
value:'*',
width: 200,
allowBlank: false,
listeners: {
'render': function(c) {
c.getEl().on('keyup', function() {
}, c);
}
}
});
//Additional Filter //Additional Filter
var txtoAddFilter=new Ext.form.TextField({ var txtoAddFilter=new Ext.form.TextField({
id: 'AUTH_SOURCE_ADDITIONAL_FILTER', id: 'AUTH_SOURCE_ADDITIONAL_FILTER',
fieldLabel: _('ID_ADDITIONAL_FILTER'), fieldLabel: _('ID_ADDITIONAL_FILTER'),
xtype:'textfield', xtype:'textfield',
value:'', value:'',
width: 200, width: 300,
autoCreate: {tag: 'input', type: 'text', size: '20', autocomplete: 'off', maxlength: '200'}, autoCreate: {tag: 'input', type: 'text', size: '20', autocomplete: 'off', maxlength: '200'},
allowBlank: true, allowBlank: true,
listeners: { listeners: {
@@ -270,21 +253,6 @@ Ext.onReady(function(){
} }
} }
}); });
//Attributes
var txtAttributes=new Ext.form.TextArea({
id: 'AUTH_SOURCE_ATTRIBUTES',
fieldLabel: _('ID_ATTRIBUTES'),
xtype:'textArea',
value:'cn' + "\n" + 'uid' + "\n" + 'givenname' + "\n" + 'sn' + "\n" + 'mail' + "\n" + 'mobile',
width: 200,
allowBlank: false,
listeners: {
'render': function(c) {
c.getEl().on('keyup', function() {
}, c);
}
}
});
//here we are setting the fields //here we are setting the fields
fieldsAS = new Ext.form.FieldSet({ fieldsAS = new Ext.form.FieldSet({
title: _('ID_AUTHENTICATION_SOURCE_INFORMATION'), title: _('ID_AUTHENTICATION_SOURCE_INFORMATION'),
@@ -302,9 +270,7 @@ Ext.onReady(function(){
txtSearchUser, txtSearchUser,
txtPassword , txtPassword ,
txtIdentifier, txtIdentifier,
txtaClass, txtoAddFilter
txtoAddFilter,
txtAttributes
] ]
}); });
@@ -333,18 +299,18 @@ Ext.onReady(function(){
{ {
text: _('ID_SAVE'), text: _('ID_SAVE'),
handler: TestSite handler: TestSite
}, },
{ {
text: _('ID_CANCEL'), text: _('ID_CANCEL'),
handler: goback handler: goback
} }
] ]
}); });
formAuthSource.render(document.body); formAuthSource.render(document.body);
}); });
function goback(){ function goback(){
window.location = 'authSources_List'; window.location = 'authSources_List';
@@ -354,7 +320,7 @@ Ext.onReady(function(){
url: '../adminProxy/saveAuthSources', url: '../adminProxy/saveAuthSources',
params: { params: {
// action : 'tryit', // action : 'tryit',
AUTH_SOURCE_UID: formAuthSource.getForm().findField('AUTH_SOURCE_UID').getValue(), AUTH_SOURCE_UID: formAuthSource.getForm().findField('AUTH_SOURCE_UID').getValue(),
AUTH_SOURCE_NAME: formAuthSource.getForm().findField('AUTH_SOURCE_NAME').getValue(), AUTH_SOURCE_NAME: formAuthSource.getForm().findField('AUTH_SOURCE_NAME').getValue(),
LDAP_TYPE: formAuthSource.getForm().findField('LDAP_TYPE').getValue(), LDAP_TYPE: formAuthSource.getForm().findField('LDAP_TYPE').getValue(),
AUTH_SOURCE_SERVER_NAME: formAuthSource.getForm().findField('AUTH_SOURCE_SERVER_NAME').getValue(), AUTH_SOURCE_SERVER_NAME: formAuthSource.getForm().findField('AUTH_SOURCE_SERVER_NAME').getValue(),
@@ -365,15 +331,13 @@ Ext.onReady(function(){
AUTH_SOURCE_PASSWORD: formAuthSource.getForm().findField('AUTH_SOURCE_PASSWORD').getValue(), AUTH_SOURCE_PASSWORD: formAuthSource.getForm().findField('AUTH_SOURCE_PASSWORD').getValue(),
AUTH_SOURCE_VERSION: formAuthSource.getForm().findField('AUTH_SOURCE_VERSION').getValue(), AUTH_SOURCE_VERSION: formAuthSource.getForm().findField('AUTH_SOURCE_VERSION').getValue(),
AUTH_SOURCE_BASE_DN: formAuthSource.getForm().findField('AUTH_SOURCE_BASE_DN').getValue(), AUTH_SOURCE_BASE_DN: formAuthSource.getForm().findField('AUTH_SOURCE_BASE_DN').getValue(),
AUTH_SOURCE_OBJECT_CLASSES: formAuthSource.getForm().findField('AUTH_SOURCE_OBJECT_CLASSES').getValue(),
AUTH_SOURCE_ATTRIBUTES: formAuthSource.getForm().findField('AUTH_SOURCE_ATTRIBUTES').getValue(),
AUTH_SOURCE_ADDITIONAL_FILTER: formAuthSource.getForm().findField('AUTH_SOURCE_ADDITIONAL_FILTER').getValue() AUTH_SOURCE_ADDITIONAL_FILTER: formAuthSource.getForm().findField('AUTH_SOURCE_ADDITIONAL_FILTER').getValue()
}, },
waitMsg : 'testing...', waitMsg : _('ID_SAVING'),
timeout : 3600, timeout : 3600,
success: function(f,a){ success: function(f,a){
resp = Ext.util.JSON.decode(a.response.responseText); resp = Ext.util.JSON.decode(a.response.responseText);
if (resp.success){ if (resp.success){
window.location = 'authSources_List'; window.location = 'authSources_List';