.gitlab-ci.yml

 stages:
-  - default
+  - quality
+  - tests
+  - install
 
-publish:
-  stage: default
+
+
+code-quality:
+  stage: quality
   script:
+    - export DEBIAN_FRONTEND=noninteractive
     - apt-get update
     - apt-get dist-upgrade -y
+    - apt-get install -y perl-modules
+    - apt-get install -y make
     - apt-get install -y libperl-critic-perl
     - perlcritic --gentle "$CI_PROJECT_DIR"
 
+
+
+make-test:
+  stage: tests
+  script:
+    - export DEBIAN_FRONTEND=noninteractive
+    - apt-get update
+    - apt-get dist-upgrade -y
+    - apt-get install -y git make
+    - apt-get install -y libdevel-cover-perl libpod-coverage-perl libtest-most-perl
+    - apt-get install -y libnet-server-perl libconfig-inifiles-perl libdatetime-perl libcache-fastmmap-perl libtimedate-perl
+      libcrypt-des-perl libcrypt-rc4-perl libdigest-sha-perl libdigest-md4-perl libmime-lite-perl
+    - apt-get install -y mariadb-server
+
+    # Start services and create dirs we need
+    - service mysql start
+    - mkdir /var/run/smradius
+
+    # Update our dependencies
+    - cd "$CI_PROJECT_DIR"
+    - ./update-git-modules
+    - perl -MCPAN -e 'install Math::Expression' < /dev/null
+
+    # Build Makefile and make
+    - perl Makefile.PL
+    - make
+
+    # Convert DB into MySQL
+    - blib/script/convert-tsql MySQL database/core.tsql > database/core.mysql
+    - blib/script/convert-tsql MySQL database/users-accounting-summary.tsql > database/users-accounting-summary.mysql
+    - blib/script/convert-tsql MySQL database/wisp.tsql > database/wisp.mysql
+
+    # Load SQL into DB
+    - echo "CREATE DATABASE smradiustest;" | mysql -u root
+    - mysql -u root smradiustest < database/core.mysql
+    - mysql -u root smradiustest < database/users-accounting-summary.mysql
+    - mysql -u root smradiustest < database/wisp.mysql
+
+    # Sort out config file
+    - cp smradiusd.conf smradiusd.conf.test
+    - perl -pi -e 's/database=smradius/database=smradiustest/' smradiusd.conf.test
+
+    # Run tests, exclude all but smradius
+    - DBTESTS=1 cover -test -ignore_re '.*' -select_re '^blib\/lib\/smradius\/' | tee devel-coverage.txt
+    - grep "^Total" devel-coverage.txt | awk '{ print "(" $8 "%) covered" }'
+
+
+
+make-install:
+  stage: install
+  script:
+    - export DEBIAN_FRONTEND=noninteractive
+    - apt-get update
+    - apt-get dist-upgrade -y
+    - apt-get install -y git make
+    - apt-get install -y mariadb-server
+    - cd "$CI_PROJECT_DIR"
+    - ./update-git-modules
+    - perl Makefile.PL
+    - make install
+

.gitmodules

-[submodule "awitpt"]
-	path = awitpt
-	url = https://gitlab.devlabs.linuxassist.net/awit-frameworks/awit-perl-toolkit.git
 [submodule "webgui/awitef"]
 	path = webgui/awitef
 	url = https://gitlab.devlabs.linuxassist.net/awit-frameworks/awit-extjs-framework.git
+[submodule "awitpt"]
+	path = 3rdparty/awitpt
+	url = https://gitlab.devlabs.linuxassist.net/awit-frameworks/awit-perl-toolkit.git
+	branch = v1.0.x

3rdparty/Makefile.PL

+# Makefile
+# 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 strict;
+use warnings;
+
+
+
+use ExtUtils::MakeMaker;
+use File::Find;
+
+
+
+my @additionalDirs = ();
+
+find(
+	{
+		wanted => sub {
+			if (/^Makefile.PL$/) {
+				my $dirname = $File::Find::dir;
+				if ($dirname ne ".") {
+					$dirname =~ s,\./,,;
+					push(@additionalDirs,$dirname);
+				}
+			};
+		},
+		bydepth => 1,
+	},
+	".",
+);
+
+WriteMakefile(
+	'NAME' => 'SMRadius-3rdParty',
+
+	'DIR' => \@additionalDirs,
+);
+
+
+
+# vim: ts=4

awitpt @ 6944c201

+Subproject commit 6944c2017372a13a334f902fdd8461e171393949

FEATURES

@@ -27,7 +27,7 @@ Enhanced features:
 * Plugin: Topups
 * Plugin: Auto-topups
 * Plugin: Usage/Time caps
-* Plugin: Prepaid accounting based on usage/time 
+* Plugin: Prepaid accounting based on usage/time
 * Plugin: Creation of accounting START records when no START record has been received but an interim update has - helps on slow/lossly links
 * Plugin: Notifications, % based or approximate time based
 * Plugin: User blacklists

INSTALL

@@ -8,10 +8,10 @@ Installing SMRadius.
 - Cache::FastMmap (Debian based: libcache-fastmmap-perl, RPM based: perl-Cache-FastMmap)
 - DateTime (requires: perl-Class-Singleton)
 - TimeDate
-- Crypt::DES
-- Crytpt::RC4
-- Digest::SHA1
-- Digest::MD4
+- Crypt::DES (Debian based: libcrypt-des-perl)
+- Crytpt::RC4 (Debian based: libcrypt-rc4-perl)
+- Digest::SHA1 (Debian based: libdigest-sha-perl)
+- Digest::MD4 (Debian based: libdigest-md4-perl)
 - Math::Expression
 
 * Requirements for webui

smradius/util.pm → Makefile.PL

-# SMRadius Utility Functions
-# Copyright (C) 2007-2015, AllWorldIT
+# Makefile
+# 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
@@ -16,103 +16,34 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-## @class smradius::util
-# Utility functions
-package smradius::util;
 
 use strict;
 use warnings;
 
-# Exporter stuff
-require Exporter;
-our (@ISA,@EXPORT);
-@ISA = qw(Exporter);
-@EXPORT = qw(
-	niceUndef
-	templateReplace
-	isBoolean
-);
-
-
-
-## @fn niceUndef($string)
-# If string defined return 'string', or if undefined return -undef-
-#
-# @param string String to check
-#
-# @return Return 'string' if defined, or -undef- otherwise
-sub niceUndef
-{
-	my $string = shift;
-
-
-	return defined($string) ? "'$string'" : '-undef-';
-}
 
 
-## @fn templateReplace($string,$hashref)
-# Template string replacer function
-#
-# @param string String to replace template items in
-# @param hashref Hashref containing the hash of tempalte items & values
-#
-# @return String with replaced items
-sub templateReplace
-{
-	my ($string,$hashref) = @_;
+use ExtUtils::MakeMaker;
+use File::Find;
 
 
-	my @valueArray = ();
 
-	# Replace blanks
-	while (my ($entireMacro,$section,$item,$default) = ($string =~ /(\%{([a-z]+)\.([a-z0-9\-]+)(?:=([^}]*))?})/i )) {
-		# Replace macro with ?	
-		$string =~ s/$entireMacro/\?/;
+WriteMakefile(
+	'NAME' => 'SMRadius',
 
-		# Get value to substitute
-		my $value = defined($hashref->{$section}->{$item}) ? $hashref->{$section}->{$item} : $default;
+	'VENDORPREFIX' => '/opt/smradius',
+	'INSTALLDIRS' => 'vendor',
 
-		# Add value onto our array
-		push(@valueArray,$value);
-		
-	}
+	'VERSION_FROM' => "lib/smradius/version.pm",
 
-	return ($string, @valueArray);
-}
+	'DIR' => ["3rdparty"],
 
-
-## @fn isBoolean($var)
-# Check if a variable is boolean
-#
-# @param var Variable to check
-#
-# @return 1, 0 or undef
-sub isBoolean
-{
-	my $var = shift;
-
-
-	# Check if we're defined
-	if (!defined($var)) {
-		return;
-	}
-
-	# Nuke whitespaces
-	$var =~ s/\s//g;
-
-	# Allow true, on, set, enabled, 1, false, off, unset, disabled, 0
-	if ($var =~ /^(?:true|on|set|enabled|1)$/i) {
-		return 1;
-	}
-	if ($var =~ /^(?:false|off|unset|disabled|0)$/i) {
-		return 0;
-	}
-
-	# Invalid or unknown
-	return;
-}
+	'EXE_FILES' => [qw(
+		bin/smradiusd
+		bin/smadmin
+		bin/smradclient
+	)],
+);
 
 
 
-1;
 # vim: ts=4

README.md

+
+[![build status](https://gitlab.devlabs.linuxassist.net/smradius/smradius/badges/master/build.svg)](https://gitlab.devlabs.linuxassist.net/smradius/smradius/commits/master)
+
+[![coverage report](https://gitlab.devlabs.linuxassist.net/smradius/smradius/badges/master/coverage.svg)](https://gitlab.devlabs.linuxassist.net/smradius/smradius/commits/master)
\ No newline at end of file

TODO

@@ -5,8 +5,7 @@ smradiusd:
 
 * Create a raddbpath config option which is prepended to dict paths
 
-usage related queries:
-* Use Math module to perform calculations
+* Configurable 'use defaults for POD/CoA' we may not want to send these
 
 smadmin:
 * Ability to run smadmin before the end of current month and updating the records as necessary at a later stage

awitpt @ 932340ef

-Subproject commit 932340ef7336dc40bdd3d35d2023bde1310e9066

smadmin → bin/smadmin

@@ -17,15 +17,16 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
+
 use strict;
 use warnings;
 
 
-# Set library directory
-use lib qw(
-	smradius
-	awitpt/lib
-);
+
+use Config;
+use FindBin;
+use lib ("$FindBin::Bin/../lib", "$FindBin::Bin/../share/perl5", "$FindBin::Bin/../share/perl/$Config{'version'}");
+
 
 
 # Check Config::IniFiles is instaslled

bin/smradclient

+#!/usr/bin/perl
+# Radius client
+# 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.
+
+use strict;
+use warnings;
+
+
+
+use Config;
+use FindBin;
+use lib ("$FindBin::Bin/../lib", "$FindBin::Bin/../share/perl5", "$FindBin::Bin/../share/perl/$Config{'version'}");
+
+use smradius::client;
+
+
+
+# Grab and exit with result received
+my $res = smradius::client->run();
+exit($res);
+
+
+
+# vim: ts=4

bin/smradiusd

+#!/usr/bin/perl
+# Radius daemon
+# 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.
+
+
+
+use strict;
+use warnings;
+
+
+
+use Config;
+use FindBin;
+use lib ("$FindBin::Bin/../lib", "$FindBin::Bin/../share/perl5", "$FindBin::Bin/../share/perl/$Config{'version'}");
+
+
+use smradius::daemon;
+smradius::daemon->run();
+
+
+
+1;
+# vim: ts=4

database/convert-tsql

-#!/bin/bash
-# Database translation/creation script
-# Copyright (C) 2009-2016, AllWorldIT
-# Copyright (C) 2008, LinuxRulz
-#
-# 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.
-
-database="$1"
-file="$2"
-prefix="$3"
-
-
-# Display usage info
-display_usage() {
-    echo "Usage: $0 <database type> <file> [prefix]"
-    echo
-    echo "Valid database types:"
-    echo "      mysql   - For MySQL v5.5+"
-    echo "      pgsql   - For PostgreSQL"
-    echo "      sqlite  - For SQLite v3"
-    echo
-    exit
-}
-
-
-# Check we have our params
-if [ -z "$database" -o -z "$file" ]
-then
-    display_usage
-fi
-
-
-
-# Check file exists
-if [ ! -f "$file" ]
-then
-    echo "ERROR: Cannot open file '$file'"
-    exit 1
-fi
-
-# Check what we converting for
-case "$database" in
-	"mysql")
-		sed \
-			-e "s/@PREFIX@/$prefix/g" \
-			-e 's/@PRELOAD@/SET FOREIGN_KEY_CHECKS=0;/' \
-			-e 's/@POSTLOAD@/SET FOREIGN_KEY_CHECKS=1;/' \
-			-e 's/@CREATE_TABLE_SUFFIX@/ENGINE=InnoDB CHARACTER SET latin1 COLLATE latin1_bin/' \
-			-e 's/@SERIAL_TYPE@/SERIAL/' \
-			-e 's/@BIGINT_UNSIGNED@/BIGINT UNSIGNED/' \
-			-e 's/@INT_UNSIGNED@/INT UNSIGNED/' \
-			-e 's/@TRACK_KEY_LEN@/512/' \
-			-e 's/@SERIAL_REF_TYPE@/BIGINT UNSIGNED/' < "$file"
-		;;
-
-	"pgsql")
-		sed \
-			-e "s/@PREFIX@/$prefix/g" \
-			-e 's/@PRELOAD@/SET CONSTRAINTS ALL DEFERRED;/' \
-			-e 's/@POSTLOAD@//' \
-			-e 's/@CREATE_TABLE_SUFFIX@//' \
-			-e 's/@SERIAL_TYPE@/SERIAL PRIMARY KEY/' \
-			-e 's/@BIGINT_UNSIGNED@/INT8/' \
-			-e 's/@INT_UNSIGNED@/INT8/' \
-			-e 's/@TRACK_KEY_LEN@/512/' \
-			-e 's/@SERIAL_REF_TYPE@/INT8/' < "$file"
-		;;
-
-	"sqlite")
-		sed \
-			-e "s/@PREFIX@/$prefix/g" \
-			-e 's/@PRELOAD@//' \
-			-e 's/@POSTLOAD@//' \
-			-e 's/@CREATE_TABLE_SUFFIX@//' \
-			-e 's/@SERIAL_TYPE@/INTEGER PRIMARY KEY AUTOINCREMENT/' \
-			-e 's/@BIGINT_UNSIGNED@/INT8/' \
-			-e 's/@INT_UNSIGNED@/INT8/' \
-			-e 's/@TRACK_KEY_LEN@/512/' \
-			-e 's/@SERIAL_REF_TYPE@/INT8/' < "$file"
-		;;
-
-	*)
-	    echo "ERROR: Invalid database type '$database'"
-	    exit 1
-	    ;;
-
-esac
-
-

database/core.tsql

@@ -179,7 +179,7 @@ CREATE TABLE @PREFIX@topups_summary (
 
 	TopupID			@SERIAL_REF_TYPE@ NOT NULL,
 
-	PeriodKey		VARCHAR(255) NOT NULL, 
+	PeriodKey		VARCHAR(255) NOT NULL,
 
 	Balance			@INT_UNSIGNED@,
 
@@ -199,13 +199,13 @@ CREATE TABLE @PREFIX@accounting (
 
 	ServiceType		@INT_UNSIGNED@,
 
-	FramedProtocol		@INT_UNSIGNED@, 
+	FramedProtocol		@INT_UNSIGNED@,
 
 	NASPort			VARCHAR(255),
 
 	NASPortType		@INT_UNSIGNED@,
 
-	CallingStationID	VARCHAR(255), 
+	CallingStationID	VARCHAR(255),
 
 	CalledStationID		VARCHAR(255),
 
@@ -251,6 +251,9 @@ CREATE INDEX @PREFIX@accounting_idx2 ON @PREFIX@accounting (PeriodKey);
 CREATE INDEX @PREFIX@accounting_idx4 ON @PREFIX@accounting (Username,AcctSessionID,NASIPAddress,NASPort);
 /* accounting_update_query */
 CREATE INDEX @PREFIX@accounting_idx5 ON @PREFIX@accounting (Username,AcctSessionID,NASIPAddress,NASPort,PeriodKey);
+/* Index for the EventTimestamp */
+CREATE INDEX @PREFIX@accounting_idx7 ON @PREFIX@accounting (EventTimestamp);
+CREATE INDEX @PREFIX@accounting_idx8 ON @PREFIX@accounting (Username,EventTimestamp);
 
 
 
@@ -269,11 +272,14 @@ CREATE TABLE @PREFIX@accounting_summary (
 	TotalOutput		@INT_UNSIGNED@
 ) @CREATE_TABLE_SUFFIX@;
 
+CREATE INDEX @PREFIX@accounting_summary_idx1 ON @PREFIX@accounting_summary (Username);
+CREATE INDEX @PREFIX@accounting_summary_idx2 ON @PREFIX@accounting_summary (PeriodKey);
+CREATE INDEX @PREFIX@accounting_summary_idx3 ON @PREFIX@accounting_summary (Username,PeriodKey);
 
 
 /* Users data */
 CREATE TABLE @PREFIX@users_data (
-	ID 			@SERIAL_TYPE@,
+	ID				@SERIAL_TYPE@,
 
 	UserID			@INT_UNSIGNED@,
 
@@ -284,4 +290,4 @@ CREATE TABLE @PREFIX@users_data (
 	Value			VARCHAR(255),
 
 	UNIQUE (UserID,Name)
-) @CREATE_TABLE_SUFFIX@; 
+) @CREATE_TABLE_SUFFIX@;

database/users-accounting-summary.tsql

@@ -2,3 +2,4 @@ ALTER TABLE @PREFIX@users ADD COLUMN PeriodKey VARCHAR(255);
 ALTER TABLE @PREFIX@users ADD COLUMN TotalTraffic @INT_UNSIGNED@;
 ALTER TABLE @PREFIX@users ADD COLUMN TotalUptime @INT_UNSIGNED@;
 ALTER TABLE @PREFIX@users ADD COLUMN NASIdentifier VARCHAR(255);
+ALTER TABLE @PREFIX@users ADD COLUMN LastAcctUpdate DATETIME;

Radius/Dictionary.pm → lib/smradius/Radius/Dictionary.pm

@@ -17,7 +17,7 @@
 # relevant information for reproducing the bug. Packet dumps are most
 # useful.
 
-package Radius::Dictionary;
+package smradius::Radius::Dictionary;
 
 use strict;
 use warnings;

Radius/Packet.pm → lib/smradius/Radius/Packet.pm

@@ -17,7 +17,7 @@
 # relevant information for reproducing the bug. Packet dumps are most
 # useful.
 
-package Radius::Packet;
+package smradius::Radius::Packet;
 
 use strict;
 require Exporter;
@@ -32,7 +32,7 @@ $VSA = 26;			# Type assigned in RFC2138 to the
 				# Vendor-Specific Attributes
 
 # Be sure our dictionaries are current
-use Radius::Dictionary 1.50;
+use smradius::Radius::Dictionary 1.50;
 use Carp;
 use Socket;
 use Digest::MD5;

lib/smradius/Radius/README.txt

+There are notable differences between Packet.pm and the Net::Radius Packet.pm, most notable raw value support.

smradius/attributes.pm → lib/smradius/attributes.pm

@@ -41,6 +41,8 @@ our (@EXPORT);
 );
 
 
+use AWITPT::Util;
+
 # Check Math::Expression is installed
 if (!eval {require Math::Expression; 1;}) {
 	print STDERR "You're missing Math::Expression, try 'apt-get install libmath-expression-perl'\n";
@@ -51,6 +53,7 @@ use smradius::logging;
 use smradius::util;
 
 
+
 # Attributes we do not handle
 my @attributeCheckIgnoreList = (
 	'User-Password'
@@ -65,7 +68,23 @@ my @attributeReplyIgnoreList = (
 	'SMRadius-Username-Transform',
 	'SMRadius-Evaluate',
 	'SMRadius-Peer-Address',
-	'SMRadius-Disable-WebUITopup'
+	'SMRadius-Disable-WebUITopup',
+	'SMRadius-AutoTopup-Traffic-Enabled',
+	'SMRadius-AutoTopup-Traffic-Amount',
+	'SMRadius-AutoTopup-Traffic-Limit',
+	'SMRadius-AutoTopup-Traffic-Notify',
+	'SMRadius-AutoTopup-Traffic-NotifyTemplate',
+	'SMRadius-AutoTopup-Traffic-Threshold',
+	'SMRadius-AutoTopup-Uptime-Enabled',
+	'SMRadius-AutoTopup-Uptime-Amount',
+	'SMRadius-AutoTopup-Uptime-Limit',
+	'SMRadius-AutoTopup-Uptime-Notify',
+	'SMRadius-AutoTopup-Uptime-NotifyTemplate',
+	'SMRadius-AutoTopup-Uptime-Threshold',
+	'SMRadius-Config-Filter-Reply-Attribute',
+	'SMRadius-Config-Filter-Reply-VAttribute',
+	'SMRadius-FUP-Period',
+	'SMRadius-FUP-Traffic-Threshold',
 );
 my @attributeVReplyIgnoreList = (
 );
@@ -85,8 +104,8 @@ sub addAttribute
 
 	# Check we have the name, operator AND value
 	if (!defined($attribute->{'Name'}) || !defined($attribute->{'Operator'}) || !defined($attribute->{'Value'})) {
-		$server->log(LOG_DEBUG,"[ATTRIBUTES] Problem adding attribute with name = ".niceUndef($attribute->{'Name'}).
-				", operator = ".niceUndef($attribute->{'Operator'}).", value = ".niceUndef($attribute->{'Value'}));
+		$server->log(LOG_DEBUG,"[ATTRIBUTES] Problem adding attribute with name = ".prettyUndef($attribute->{'Name'}).
+				", operator = ".prettyUndef($attribute->{'Operator'}).", value = ".prettyUndef($attribute->{'Value'}));
 		return;
 	}
 
@@ -170,7 +189,7 @@ sub checkAuthAttribute
 	# Get packet attribute value
 	my $attrVal = $packetAttributes->{$attribute->{'Name'}};
 
-	$server->log(LOG_DEBUG,"[ATTRIBUTES] Processing CHECK attribute value ".niceUndef($attrVal)." against: '".
+	$server->log(LOG_DEBUG,"[ATTRIBUTES] Processing CHECK attribute value ".prettyUndef($attrVal)." against: '".
 			$attribute->{'Name'}."' ".$attribute->{'Operator'}." '".join("','",@attrValues)."'");
 
 	# Loop with all the test attribute values
@@ -327,7 +346,7 @@ sub checkAuthAttribute
 		# Always matches as a check item, and adds the current
 		# attribute with value to the list of configuration items.
 		#
-		# As a reply item, it has an itendtical meaning, but the
+		# As a reply item, it has an idendtical meaning, but the
 		# attribute is added to the reply items.
 
 		} elsif ($operator eq '+=') {
@@ -410,7 +429,7 @@ sub checkAcctAttribute
 	# Get packet attribute value
 	my $attrVal = $packetAttributes->{$attribute->{'Name'}};
 
-	$server->log(LOG_DEBUG,"[ATTRIBUTES] Processing CHECK attribute value ".niceUndef($attrVal)." against: '".
+	$server->log(LOG_DEBUG,"[ATTRIBUTES] Processing CHECK attribute value ".prettyUndef($attrVal)." against: '".
 			$attribute->{'Name'}."' ".$attribute->{'Operator'}." '".join("','",@attrValues)."'");
 
 	# Loop with all the test attribute values
@@ -424,7 +443,7 @@ sub checkAcctAttribute
 		# Always matches as a check item, and adds the current
 		# attribute with value to the list of configuration items.
 		#
-		# As a reply item, it has an itendtical meaning, but the
+		# As a reply item, it has an idendtical meaning, but the
 		# attribute is added to the reply items.
 
 		if ($operator eq '+=') {
@@ -531,7 +550,7 @@ sub setReplyAttribute
 	# Always matches as a check item, and replaces in the configuration items any attribute of the same name.
 	# If no attribute of that name appears in the request, then this attribute is added.
 	#
-	# As a reply item, it has an itendtical meaning, but for the reply items, instead of the request items.
+	# As a reply item, it has an idendtical meaning, but for the reply items, instead of the request items.
 
 	} elsif ($attribute->{'Operator'} eq ':=') {
 		# Overwrite
@@ -546,7 +565,7 @@ sub setReplyAttribute
 	# Always matches as a check item, and adds the current
 	# attribute with value to the list of configuration items.
 	#
-	# As a reply item, it has an itendtical meaning, but the
+	# As a reply item, it has an idendtical meaning, but the
 	# attribute is added to the reply items.
 
 	} elsif ($attribute->{'Operator'} eq '+=') {
@@ -595,7 +614,7 @@ sub setReplyVAttribute
 		@attrValues = ( $attribute->{'Value'} );
 	}
 
-	$server->log(LOG_DEBUG,"[VATTRIBUTES] Processing REPLY attribute: '".
+	$server->log(LOG_DEBUG,"[VATTRIBUTES] Processing REPLY vattribute: '".
 			$attribute->{'Name'}."' ".$attribute->{'Operator'}." '".join("','",@attrValues)."'");
 
 
@@ -625,7 +644,7 @@ sub setReplyVAttribute
 	# Always matches as a check item, and replaces in the configuration items any attribute of the same name.
 	# If no attribute of that name appears in the request, then this attribute is added.
 	#
-	# As a reply item, it has an itendtical meaning, but for the reply items, instead of the request items.
+	# As a reply item, it has an idendtical meaning, but for the reply items, instead of the request items.
 
 	} elsif ($attribute->{'Operator'} eq ':=') {
 		# Overwrite
@@ -640,7 +659,7 @@ sub setReplyVAttribute
 	# Always matches as a check item, and adds the current
 	# attribute with value to the list of configuration items.
 	#
-	# As a reply item, it has an itendtical meaning, but the
+	# As a reply item, it has an idendtical meaning, but the
 	# attribute is added to the reply items.
 
 	} elsif ($attribute->{'Operator'} eq '+=') {
@@ -692,7 +711,7 @@ sub processConfigAttribute
 	# Always matches as a check item, and adds the current
 	# attribute with value to the list of configuration items.
 	#
-	# As a reply item, it has an itendtical meaning, but the
+	# As a reply item, it has an idendtical meaning, but the
 	# attribute is added to the reply items.
 
 	if ($attribute->{'Operator'} eq '+=') {
@@ -705,7 +724,7 @@ sub processConfigAttribute
 	# Always matches as a check item, and replaces in the configuration items any attribute of the same name.
 	# If no attribute of that name appears in the request, then this attribute is added.
 	#
-	# As a reply item, it has an itendtical meaning, but for the reply items, instead of the request items.
+	# As a reply item, it has an idendtical meaning, but for the reply items, instead of the request items.
 
 	} elsif ($attribute->{'Operator'} eq ':=') {
 		@{$configAttributes->{$attribute->{'Name'}}} = @attrValues;
@@ -755,7 +774,7 @@ sub addAttributeConditionalVariable
 {
 	my ($user,$name,$value) = @_;
 
-	print(STDERR "CONDITIONAL VARIABLE:  $name => $value\n");
+
 	$user->{'AttributeConditionalVariables'}->{$name} = [ $value ];
 
 	return;
@@ -775,7 +794,8 @@ sub processConditional
 
 
 	# Split off expression
-	my ($condition,$onTrue,$onFalse) = ($attrVal =~ /^([^\?]*)(?:\?\s*((?:\S+)?[^:]*)(?:\s*\:\s*(.*))?)?$/);
+	# NK: This probably needs a bit of work
+	my ($condition,$onTrue,$onFalse) = ($attrVal =~ /^([^\?]*)(?:\?\s*((?:\S+)?[^:]*)(?:\:\s*(.*))?)?$/);
 
 	# If there is no condition we cannot really continue?
 	if (!defined($condition)) {
@@ -829,6 +849,10 @@ sub processConditional
 	# We only get here if $res is set to 1 above, if its only a conditional with no onTrue & onFalse
 	# Then attribStr will be unef
 	if ($res && defined($attribStr)) {
+		# Sanitize the output
+		$attribStr =~ s/^\s*//;
+		$attribStr =~ s/\s*$//;
+
 		foreach my $rawAttr (split(/;/,$attribStr)) {
 			# Split off attribute string:  name = value
 			my ($attrName,$attrVal) = ($rawAttr =~ /^\s*([^=]+)=\s*(.*)/);