Skip to content
Snippets Groups Projects
Commit 30b4c403 authored by Nigel Kukard's avatar Nigel Kukard
Browse files

* Fixed configuration for mod_userdb_sql

* Use  request.  and not  authentication. as macros
parent 6bdd91fd
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ sub init ...@@ -72,7 +72,7 @@ sub init
FROM FROM
@TP@users @TP@users
WHERE WHERE
UserName = %{authentication.User-Name} UserName = %{requet.User-Name}
'; ';
$config->{'userdb_get_group_attributes_query'} = ' $config->{'userdb_get_group_attributes_query'} = '
...@@ -121,7 +121,7 @@ sub find ...@@ -121,7 +121,7 @@ sub find
# Build template # Build template
my $template; my $template;
foreach my $attr ($packet->attributes) { foreach my $attr ($packet->attributes) {
$template->{'authentication'}->{$attr} = $packet->rawattr($attr) $template->{'request'}->{$attr} = $packet->rawattr($attr)
} }
$template->{'user'} = $user; $template->{'user'} = $user;
...@@ -168,7 +168,7 @@ sub get ...@@ -168,7 +168,7 @@ sub get
# Build template # Build template
my $template; my $template;
foreach my $attr ($packet->attributes) { foreach my $attr ($packet->attributes) {
$template->{'authentication'}->{$attr} = $packet->rawattr($attr) $template->{'request'}->{$attr} = $packet->rawattr($attr)
} }
$template->{'user'}->{'Username'} = $user->{'Username'}; $template->{'user'}->{'Username'} = $user->{'Username'};
$template->{'user'}->{'ID'} = $user->{'_UserDB_Data'}->{'id'}; $template->{'user'}->{'ID'} = $user->{'_UserDB_Data'}->{'id'};
......
...@@ -146,27 +146,34 @@ EOT ...@@ -146,27 +146,34 @@ EOT
[mod_userdb_sql] [mod_userdb_sql]
sql_password_query=<<EOT userdb_find_query=<<EOT
SELECT ID, Password FROM users WHERE Username = %u SELECT
ID
FROM
@TP@users
WHERE
UserName = %{request.User-Name}
EOT EOT
sql_failure_query=<<EOT userdb_get_group_attributes_query=<<EOT
INSERT INTO AuthFail (Username) VALUES (%u) SELECT
group_attributes.Name, group_attributes.Operator, group_attributes.Value
FROM
@TP@group_attributes, @TP@users_to_groups
WHERE
users_to_groups.UserID = %{user.ID}
AND group_attributes.GroupID = users_to_groups.GroupID
EOT EOT
sql_user_attribute_query=<<EOT userdb_get_user_attributes_query=<<EOT
SELECT Attribute, Operator, Value FROM user_attributes WHERE UserID = ${user.id} SELECT
EOT Name, Operator, Value
FROM
sql_group_query=<<EOT @TP@user_attributes
SELECT GroupID FROM users_to_groups WHERE UserID = ${user.id} WHERE
UserID = %{user.ID}
EOT EOT
sql_group_attribute_query=<<EOT
SELECT Attribute, Operator, Value FROM group_attributes WHERE GroupID = ${group.id}
EOT
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment