cleaned up pluggable auth.
This commit is contained in:
parent
96587791c0
commit
ee10a590d8
8 changed files with 539 additions and 328 deletions
|
|
@ -24,26 +24,10 @@ my %smbError = (
|
|||
);
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub hasBadUserData {
|
||||
my ($pdc, $bdc, $ntDomain, $smbLogin, $smb, $error);
|
||||
|
||||
$pdc = $session{setting}{smbPDC};
|
||||
$bdc = $session{setting}{smbBDC};
|
||||
$ntDomain = $session{setting}{smbDomain};
|
||||
$smbLogin = $session{form}{loginId};
|
||||
$smb = Authen::Smb::authen($smbLogin, $session{form}{smbPassword}, $pdc, $bdc, $ntDomain);
|
||||
if ($smb > 0) {
|
||||
$error = '<li>'. $smbError{$smb} . "pdc: $pdc, bdc: $bdc, domain: $ntDomain";
|
||||
}
|
||||
|
||||
return $error;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub validateUser {
|
||||
sub authenticate {
|
||||
my ($uid, $password, $userData, $smb, $result);
|
||||
|
||||
($uid, $password) = @_;
|
||||
$userId = $_[0]->[0];
|
||||
$password = $_[0]->[1];
|
||||
$userData = WebGUI::Authentication::getParams($uid, 'SMB');
|
||||
|
||||
$smb = Authen::Smb::authen($userData->{smbLogin}, $password, $userData->{smbPDC}, $userData->{smbBDC}, $userData->{smbDomain});
|
||||
|
|
@ -56,28 +40,25 @@ sub validateUser {
|
|||
return $result;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Below are the subs that create and save the forms used for inputting
|
||||
# config data for this auth module. The 'form' and 'save' subs of each
|
||||
# from are so related that I've grouped by function. Apart from the
|
||||
# 'save' and 'form' stuff the subs are still in alphabetical order though.
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub formAddUser {
|
||||
sub adminForm {
|
||||
my $userData = WebGUI::Authentication::getParams($_[0], 'SMB');
|
||||
my $pdc = $session{form}{smbPDC} || $userData->{smbPDC} || $session{setting}{smbPDC};
|
||||
my $bdc = $session{form}{smbBDC} || $userData->{smbBDC} || $session{setting}{smbBDC};
|
||||
my $domain = $session{form}{smbDomain} || $userData->{smbDomain} || $session{setting}{smbDomain};
|
||||
my $login = $session{form}{smbLogin} || $userData->{smbLogin};
|
||||
my $f;
|
||||
|
||||
$f = WebGUI::HTMLForm->new;
|
||||
$f->readOnly("<b>SMB Authentication Options</b>");
|
||||
$f->text("smbPDC","PDC",$session{setting}{smbPDC});
|
||||
$f->text("smbBDC","BDC",$session{setting}{smbBDC});
|
||||
$f->text("smbDomain","NT Domain",$session{setting}{smbDomain});
|
||||
$f->text("smbLogin","NT Login name",'');
|
||||
$f->readOnly('<b>'.optionsLabel().'</b>');
|
||||
$f->text("smbPDC","PDC",$pdc);
|
||||
$f->text("smbBDC","BDC",$bdc);
|
||||
$f->text("smbDomain","NT Domain",$domain);
|
||||
$f->text("smbLogin","NT Login name",$login);
|
||||
return $f->printRowsOnly;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub saveAddUser {
|
||||
sub adminFormSave {
|
||||
WebGUI::Authentication::saveParams($session{form}{uid},'SMB',
|
||||
{
|
||||
smbPDC => $session{form}{smbPDC},
|
||||
|
|
@ -88,19 +69,22 @@ sub saveAddUser {
|
|||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub formCreateAccount {
|
||||
my $f;
|
||||
sub optionsLabel {
|
||||
return "SMB Authentication Options";
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub registrationForm {
|
||||
my $f;
|
||||
$f = WebGUI::HTMLForm->new;
|
||||
$f->text("loginId","NT Login Id");
|
||||
$f->password("smbPassword","NT Password");
|
||||
|
||||
return $f->printRowsOnly;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub saveCreateAccount {
|
||||
sub registrationFormSave {
|
||||
my $uid;
|
||||
|
||||
$uid = shift;
|
||||
WebGUI::Authentication::saveParams($uid,'SMB',
|
||||
{
|
||||
|
|
@ -112,42 +96,44 @@ sub saveCreateAccount {
|
|||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub formEditUserSettings {
|
||||
my $f;
|
||||
sub registrationFormValidate {
|
||||
my ($pdc, $bdc, $ntDomain, $smbLogin, $smb, $error);
|
||||
$pdc = $session{setting}{smbPDC};
|
||||
$bdc = $session{setting}{smbBDC};
|
||||
$ntDomain = $session{setting}{smbDomain};
|
||||
$smbLogin = $session{form}{loginId};
|
||||
$smb = Authen::Smb::authen($smbLogin, $session{form}{smbPassword}, $pdc, $bdc, $ntDomain);
|
||||
if ($smb > 0) {
|
||||
$error = '<li>'. $smbError{$smb} . "pdc: $pdc, bdc: $bdc, domain: $ntDomain";
|
||||
}
|
||||
return $error;
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub settingsForm {
|
||||
my $f;
|
||||
$f = WebGUI::HTMLForm->new;
|
||||
$f->readOnly("<b>SMB Authentication Options</b>");
|
||||
$f->readOnly('<b>'.optionsLabel().'</b>');
|
||||
$f->text("smbPDC","PDC",$session{setting}{smbPDC});
|
||||
$f->text("smbBDC","BDC",$session{setting}{smbBDC});
|
||||
$f->text("smbDomain","NT Domain",$session{setting}{smbDomain});
|
||||
|
||||
return $f->printRowsOnly;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub formEditUser {
|
||||
my ($f, $userData);
|
||||
$userData = WebGUI::Authentication::getParams($session{form}{uid}, 'SMB');
|
||||
|
||||
$f = WebGUI::HTMLForm->new;
|
||||
$f->readOnly("<b>SMB Authentication Options</b>");
|
||||
$f->text("smbPDC","PDC",$$userData{smbPDC});
|
||||
$f->text("smbBDC","BDC",$$userData{smbBDC});
|
||||
$f->text("smbDomain","NT Domain",$$userData{smbDomain});
|
||||
$f->text("smbLogin","NT Login name",$$userData{smbLogin});
|
||||
|
||||
return $f->printRowsOnly;
|
||||
sub userForm {
|
||||
return "";
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub saveEditUser {
|
||||
WebGUI::Authentication::saveParams($session{form}{uid},'SMB',
|
||||
{
|
||||
smbPDC => $session{form}{smbPDC},
|
||||
smbBDC => $session{form}{smbBDC},
|
||||
smbDomain => $session{form}{smbDomain},
|
||||
smbLogin => $session{form}{smbLogin}
|
||||
});
|
||||
sub userFormSave {
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub userFormValidate {
|
||||
return "";
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue