smradius/modules/userdb/mod_userdb_macauth_sql.pm → lib/smradius/modules/userdb/mod_userdb_macauth_sql.pm

 # SQL user database support for mac authentication
-# Copyright (C) 2007-2011, AllWorldIT
-# 
+# Copyright (C) 2007-2016, AllWorldIT
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -21,13 +21,13 @@ use strict;
 use warnings;
 
 # Modules we need
-use smradius::constants;
 use AWITPT::Cache;
-use smradius::logging;
 use AWITPT::DB::DBLayer;
 use AWITPT::Util;
-use smradius::util;
 use smradius::attributes;
+use smradius::constants;
+use smradius::logging;
+use smradius::util;
 
 # Exporter stuff
 require Exporter;
@@ -70,7 +70,7 @@ sub init
 	# Default configs...
 	$config->{'userdb_macauth_find_query'} = '
 		SELECT
-			user_attributes.ID, 
+			user_attributes.ID,
 			user_attributes.Operator, user_attributes.Disabled,
 			users.Username, users.Disabled AS UserDisabled
 		FROM
@@ -130,7 +130,8 @@ sub find
 	foreach my $attr ($packet->attributes) {
 		$template->{'request'}->{$attr} = $packet->rawattr($attr)
 	}
-	$template->{'user'} = $user;
+
+	# Add MAC address details
 	$template->{'user'}->{'MACAddress'} = $macAddress;
 
 	# Replace template entries
@@ -138,7 +139,7 @@ sub find
 
 	my $sth = DBSelect(@dbDoParams);
 	if (!$sth) {
-		$server->log(LOG_ERR,"[MOD_USERDB_MACAUTH_SQL] Failed to find data for MAC address: ".AWITPT::DB::DBLayer::Error());
+		$server->log(LOG_ERR,"[MOD_USERDB_MACAUTH_SQL] Failed to find data for MAC address: ".AWITPT::DB::DBLayer::error());
 		return MOD_RES_SKIP;
 	}
 

smradius/modules/userdb/mod_userdb_sql.pm → lib/smradius/modules/userdb/mod_userdb_sql.pm

 # SQL user database support
-# Copyright (C) 2007-2011, AllWorldIT
-# 
+# Copyright (C) 2007-2016, AllWorldIT
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -21,13 +21,13 @@ use strict;
 use warnings;
 
 # Modules we need
-use smradius::constants;
 use AWITPT::Cache;
-use smradius::logging;
 use AWITPT::DB::DBLayer;
 use AWITPT::Util;
-use smradius::util;
 use smradius::attributes;
+use smradius::constants;
+use smradius::logging;
+use smradius::util;
 
 # Exporter stuff
 require Exporter;
@@ -91,7 +91,7 @@ sub init
 		FROM
 			@TP@group_attributes, @TP@users_to_groups
 		WHERE
-			@TP@users_to_groups.UserID = %{userdb.ID}
+			@TP@users_to_groups.UserID = %{user.ID}
 			AND @TP@group_attributes.GroupID = @TP@users_to_groups.GroupID
 			AND @TP@group_attributes.Disabled = 0
 	';
@@ -102,22 +102,22 @@ sub init
 		FROM
 			@TP@user_attributes
 		WHERE
-			UserID = %{userdb.ID}
+			UserID = %{user.ID}
 			AND Disabled = 0
 	';
-	
+
 	$config->{'users_data_set_query'} = '
 		INSERT INTO
 			@TP@users_data (UserID, LastUpdated, Name, Value)
 		VALUES
 			(
-				%{userdb.ID},
+				%{user.ID},
 				%{query.LastUpdated},
 				%{query.Name},
 				%{query.Value}
 			)
 	';
-	
+
 	$config->{'users_data_update_query'} = '
 		UPDATE
 			@TP@users_data
@@ -125,25 +125,25 @@ sub init
 			LastUpdated = %{query.LastUpdated},
 			Value = %{query.Value}
 		WHERE
-			UserID = %{userdb.ID}
+			UserID = %{user.ID}
 			AND Name = %{query.Name}
 	';
-	
+
 	$config->{'users_data_get_query'} = '
 		SELECT
 			LastUpdated, Name, Value
 		FROM
 			@TP@users_data
 		WHERE
-			UserID = %{userdb.ID}
+			UserID = %{user.ID}
 			AND Name = %{query.Name}
 	';
-	
+
 	$config->{'users_data_delete_query'} = '
 		DELETE FROM
 			@TP@users_data
 		WHERE
-			UserID = %{userdb.ID}
+			UserID = %{user.ID}
 			AND Name = %{query.Name}
 	';
 
@@ -165,10 +165,10 @@ sub init
 		if (defined($scfg->{'mod_userdb_sql'}->{'userdb_get_group_attributes_query'}) &&
 				$scfg->{'mod_userdb_sql'}->{'userdb_get_group_attributes_query'} ne "") {
 			if (ref($scfg->{'mod_userdb_sql'}->{'userdb_get_group_attributes_query'}) eq "ARRAY") {
-				$config->{'userdb_get_group_attributes_query'} = join(' ', 
+				$config->{'userdb_get_group_attributes_query'} = join(' ',
 						@{$scfg->{'mod_userdb_sql'}->{'userdb_get_group_attributes_query'}});
 			} else {
-				$config->{'userdb_get_group_attributes_query'} = 
+				$config->{'userdb_get_group_attributes_query'} =
 						$scfg->{'mod_userdb_sql'}->{'userdb_get_group_attributes_query'};
 			}
 		}
@@ -179,7 +179,7 @@ sub init
 				$config->{'userdb_get_user_attributes_query'} = join(' ',
 						@{$scfg->{'mod_userdb_sql'}->{'userdb_get_user_attributes_query'}});
 			} else {
-					$config->{'userdb_get_user_attributes_query'} = 
+					$config->{'userdb_get_user_attributes_query'} =
 						$scfg->{'mod_userdb_sql'}->{'userdb_get_user_attributes_query'};
 			}
 		}
@@ -225,10 +225,14 @@ sub init
 		}
 
 		if (defined($scfg->{'mod_userdb_sql'}->{'userdb_data_cache_time'})) {
-			if ($scfg->{'mod_userdb_sql'}{'userdb_data_cache_time'} =~ /^\s*(yes|true|1)\s*$/i) {
-				# Default?
-			} elsif ($scfg->{'mod_userdb_sql'}{'userdb_data_cache_time'} =~ /^\s*(no|false|0)\s*$/i) {
-				$config->{'userdb_data_cache_time'} = undef;
+			if (defined(my $val = isBoolean($scfg->{'mod_userdb_sql'}{'userdb_data_cache_time'}))) {
+				# If val is true, we default to the default anyway
+
+				# We're disabled
+				if (!$val) {
+					$config->{'userdb_data_cache_time'} = undef;
+				}
+			# We *could* have a value...
 			} elsif ($scfg->{'mod_userdb_sql'}{'userdb_data_cache_time'} =~ /^[0-9]+$/) {
 				$config->{'userdb_data_cache_time'} = $scfg->{'mod_userdb_sql'}{'userdb_data_cache_time'};
 			} else {
@@ -264,14 +268,16 @@ sub find
 	foreach my $attr ($packet->attributes) {
 		$template->{'request'}->{$attr} = $packet->rawattr($attr)
 	}
-	$template->{'user'} = $user;
+
+	# Add user details, not user ID is available here as thats what we are retrieving
+	$template->{'user'}->{'Username'} = $user->{'Username'};
 
 	# Replace template entries
 	my @dbDoParams = templateReplace($config->{'userdb_find_query'},$template);
 
 	my $sth = DBSelect(@dbDoParams);
 	if (!$sth) {
-		$server->log(LOG_ERR,"[MOD_USERDB_SQL] Failed to find user data: ".AWITPT::DB::DBLayer::Error());
+		$server->log(LOG_ERR,"[MOD_USERDB_SQL] Failed to find user data: ".AWITPT::DB::DBLayer::error());
 		return MOD_RES_SKIP;
 	}
 
@@ -320,6 +326,11 @@ sub get
 	foreach my $attr ($packet->attributes) {
 		$template->{'request'}->{$attr} = $packet->rawattr($attr)
 	}
+
+	# Add user details
+	$template->{'user'}->{'ID'} = $user->{'ID'};
+	$template->{'user'}->{'Username'} = $user->{'Username'};
+
 	# Add in userdb data
 	foreach my $item (keys %{$user->{'_UserDB_Data'}}) {
 		$template->{'userdb'}->{$item} = $user->{'_UserDB_Data'}->{$item};
@@ -331,7 +342,7 @@ sub get
 	# Query database
 	my $sth = DBSelect(@dbDoParams);
 	if (!$sth) {
-		$server->log(LOG_ERR,"Failed to get group attributes: ".AWITPT::DB::DBLayer::Error());
+		$server->log(LOG_ERR,"Failed to get group attributes: ".AWITPT::DB::DBLayer::error());
 		return RES_ERROR;
 	}
 
@@ -349,7 +360,7 @@ sub get
 	# Query database
 	$sth = DBSelect(@dbDoParams);
 	if (!$sth) {
-		$server->log(LOG_ERR,"Failed to get user attributes: ".AWITPT::DB::DBLayer::Error());
+		$server->log(LOG_ERR,"Failed to get user attributes: ".AWITPT::DB::DBLayer::error());
 		return RES_ERROR;
 	}
 
@@ -381,23 +392,28 @@ sub data_set
 
 	# Build template
 	my $template;
-	# Last updated time would be now
-	$template->{'query'}->{'LastUpdated'} = $user->{'_Internal'}->{'Timestamp'};
-	$template->{'query'}->{'Name'} = sprintf('%s/%s',$module,$name);
-	$template->{'query'}->{'Value'} = $value;
+
+	# Add user details
+	$template->{'user'}->{'ID'} = $user->{'ID'};
+	$template->{'user'}->{'Username'} = $user->{'Username'};
 
 	# Add in userdb data
 	foreach my $item (keys %{$user->{'_UserDB_Data'}}) {
 		$template->{'userdb'}->{$item} = $user->{'_UserDB_Data'}->{$item};
 	}
 
+	# Last updated time would be now
+	$template->{'query'}->{'LastUpdated'} = $user->{'_Internal'}->{'Timestamp'};
+	$template->{'query'}->{'Name'} = sprintf('%s/%s',$module,$name);
+	$template->{'query'}->{'Value'} = $value;
+
 	# Replace template entries
 	my @dbDoParams = templateReplace($config->{'users_data_update_query'},$template);
 
 	# Query database
 	my $sth = DBDo(@dbDoParams);
 	if (!$sth) {
-		$server->log(LOG_ERR,"Failed to update users data: ".AWITPT::DB::DBLayer::Error());
+		$server->log(LOG_ERR,"Failed to update users data: ".AWITPT::DB::DBLayer::error());
 		return RES_ERROR;
 	}
 
@@ -408,7 +424,7 @@ sub data_set
 		# Insert
 		$sth = DBDo(@dbDoParams);
 		if (!$sth) {
-			$server->log(LOG_ERR,"Failed to set users data: ".AWITPT::DB::DBLayer::Error());
+			$server->log(LOG_ERR,"Failed to set users data: ".AWITPT::DB::DBLayer::error());
 			return RES_ERROR;
 		}
 	}
@@ -422,7 +438,7 @@ sub data_set
 		$data{'Module'} = $module;
 		$data{'Name'} = $name;
 		$data{'Value'} = $value;
-		
+
 		# Cache the result
 		cacheStoreComplexKeyPair('mod_userdb_sql(users_data)',
 				sprintf('%s/%s/%s',$module,$user->{'_UserDB_Data'}->{'ID'},$name),
@@ -453,13 +469,18 @@ sub data_get
 
 	# Build template
 	my $template;
-	$template->{'query'}->{'Name'} = sprintf('%s/%s',$module,$name);
+
+	# Add user details
+	$template->{'user'}->{'ID'} = $user->{'ID'};
+	$template->{'user'}->{'Username'} = $user->{'Username'};
 
 	# Add in userdb data
 	foreach my $item (keys %{$user->{'_UserDB_Data'}}) {
 		$template->{'userdb'}->{$item} = $user->{'_UserDB_Data'}->{$item};
 	}
 
+	$template->{'query'}->{'Name'} = sprintf('%s/%s',$module,$name);
+
 	# If we using caching, check how old the result is
 	if (defined($config->{'userdb_data_cache_time'})) {
 		my ($res,$val) = cacheGetComplexKeyPair('mod_userdb_sql(data_get)',
@@ -477,7 +498,7 @@ sub data_get
 	# Query database
 	my $sth = DBSelect(@dbDoParams);
 	if (!$sth) {
-		$server->log(LOG_ERR,"Failed to get users data: ".AWITPT::DB::DBLayer::Error());
+		$server->log(LOG_ERR,"Failed to get users data: ".AWITPT::DB::DBLayer::error());
 		return RES_ERROR;
 	}
 
@@ -497,7 +518,7 @@ sub data_get
 	# If we using caching and got here, it means that we must cache the result
 	if (defined($config->{'userdb_data_cache_time'})) {
 		$data{'CachedUntil'} = $user->{'_Internal'}->{'Timestamp-Unix'} + $config->{'userdb_data_cache_time'};
-		
+
 		# Cache the result
 		cacheStoreComplexKeyPair('mod_userdb_sql(users_data)',
 				sprintf('%s/%s/%s',$module,$user->{'_UserDB_Data'}->{'ID'},$name),

lib/smradius/util.pm

+# SMRadius Utility Functions
+# Copyright (C) 2007-2016, AllWorldIT
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+=encoding utf8
+
+=head1 NAME
+
+smradius::util - SMRadius utils
+
+=head1 SYNOPSIS
+
+	my ($str,@vals) = templateReplace("SELECT * FROM abc WHERE %{abc} = ?",{ 'abc' => "some value" });
+
+	my $str = quickTemplateToolkit('someval is "[% someval %]"',{ 'someval' = "hello world" });
+
+=head1 DESCRIPTION
+
+The smradius::util class provides utility classes for SMRadius.
+
+=cut
+
+
+package smradius::util;
+use parent qw(Exporter);
+
+use strict;
+use warnings;
+
+our (@EXPORT_OK,@EXPORT);
+@EXPORT_OK = qw(
+);
+@EXPORT = qw(
+	templateReplace
+	quickTemplateToolkit
+);
+
+
+use Template;
+
+
+
+=head1 METHODS
+
+The following utility methods are available.
+
+=cut
+
+
+
+=head2 templateReplace
+
+	my ($str,@vals) = templateReplace("SELECT * FROM abc WHERE %{abc} = ?",{ 'abc' => "some value" });
+
+The C<templatereplace> method is used to replace variables with a placeholder. This is very useful for SQL templates. The values
+are returned in the second and subsequent array items.
+
+=over
+
+=back
+
+=cut
+
+# Replace hashed variables with placeholders and return an array with the values.
+sub templateReplace
+{
+	my ($string,$hashref,$placeholder) = @_;
+
+
+	my @valueArray = ();
+	$placeholder //= '?';
+
+	# Replace blanks
+	while (my ($entireMacro,$section,$item,$default) = ($string =~ /(\%\{([a-z]+)\.([a-z0-9\-]+)(?:=([^\}]*))?\})/i )) {
+		# Replace macro with ? or the placeholder if specified
+		# We also quote the entireMacro
+		$string =~ s/\Q$entireMacro\E/$placeholder/;
+
+		# Get value to substitute
+		my $value = (defined($hashref->{$section}) && defined($hashref->{$section}->{$item})) ?
+				$hashref->{$section}->{$item} : $default;
+
+		# Add value onto our array
+		push(@valueArray,$value);
+	}
+
+	return ($string, @valueArray);
+}
+
+
+
+=head2 quickTemplateToolkit
+
+	my $str = quickTemplateToolkit('someval is "[% someval %]"',{ 'someval' = "hello world" });
+
+The C<quickTemplateToolkit> is a quick and easy template toolkit function.
+
+=over
+
+=back
+
+=cut
+
+# Replace hashed variables with placeholders and return an array with the values.
+sub quickTemplateToolkit
+{
+	my ($string,$variables) = @_;
+
+
+	# This is the config we're going to pass to Template
+	my $config = {
+		# Our include path built below
+		INCLUDE_PATH => [ ],
+	};
+
+	# Create template engine
+	my $tt = Template->new($config);
+
+	# Process the template and output to our OUTPUT_PATH
+	my $output = "";
+	if (!(my $res = $tt->process(\$string, $variables, \$output))) {
+		return (undef,$tt->error());
+	}
+
+	return $output;
+}
+
+
+
+1;
+__END__
+
+=head1 AUTHORS
+
+Nigel Kukard E<lt>nkukard@lbsd.netE<gt>
+
+=head1 BUGS
+
+All bugs should be reported via the project issue tracker
+L<http://gitlab.devlabs.linuxassist.net/awit-frameworks/awit-perl-toolkit/issues/>.
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright (C) 2007-2016, AllWorldIT
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+=head1 SEE ALSO
+
+L<Template>.
+
+=cut

smradius/version.pm → lib/smradius/version.pm

 # SMRadius version package
-# Copyright (C) 2007-2015, AllWorldIT
-# 
+# Copyright (C) 2007-2016, AllWorldIT
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -27,13 +27,19 @@ require Exporter;
 our (@ISA,@EXPORT,@EXPORT_OK);
 @ISA = qw(Exporter);
 @EXPORT = qw(
+	$VERSION
 	VERSION
 );
+@EXPORT_OK = qw(
+);
+
+
+
+our $VERSION = "1.0.1";
+
 
 
-use constant {
-	VERSION		=> "0.1.x",
-};
+sub VERSION { return $VERSION };
 
 
 

t/010-modules.t

+# Test harness for module loading
+# Copyright (C) 2014-2016, AllWorldIT
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+
+use Test::More;
+
+
+use strict;
+use warnings;
+
+
+
+require_ok("smradius::daemon");
+
+require_ok("smradius::client");
+
+
+
+done_testing();
+
+
+

update-git-modules

@@ -2,8 +2,8 @@
 
 git submodule update --recursive --init
 
-pushd awitpt
-git checkout v0.0.x
+pushd 3rdparty/awitpt
+git checkout v1.0.x
 git pull
 popd