r42050 - in /branches/upstream/libauthen-radius-perl/current: Changes LICENSE MANIFEST README Radius.pm
italo-guest at users.alioth.debian.org
italo-guest at users.alioth.debian.org
Tue Aug 18 11:40:45 UTC 2009
Author: italo-guest
Date: Tue Aug 18 11:40:38 2009
New Revision: 42050
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42050
Log:
[svn-upgrade] Integrating new upstream version, libauthen-radius-perl (0.14)
Added:
branches/upstream/libauthen-radius-perl/current/LICENSE
Modified:
branches/upstream/libauthen-radius-perl/current/Changes
branches/upstream/libauthen-radius-perl/current/MANIFEST
branches/upstream/libauthen-radius-perl/current/README
branches/upstream/libauthen-radius-perl/current/Radius.pm
Modified: branches/upstream/libauthen-radius-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libauthen-radius-perl/current/Changes?rev=42050&op=diff
==============================================================================
--- branches/upstream/libauthen-radius-perl/current/Changes (original)
+++ branches/upstream/libauthen-radius-perl/current/Changes Tue Aug 18 11:40:38 2009
@@ -1,5 +1,13 @@
Revision history for Perl extension Radius.
+0.14 Mon Aug 17 15:00:00 2009
+ - Authen::Radius is now distributed under the Perl Artistic
+ License v2.0
+ - Support for RADIUS retransmits
+ - For the "check_pwd" method plance the local socket's "real"
+ IP address into the NAS-IP-Address attribute
+ instead of 127.0.0.1
+
0.13 Mon Feb 19 22:09:00 2006
- Packet-of-disconnect support (thanks to Kostas Kalevras for
the patch)
Added: branches/upstream/libauthen-radius-perl/current/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libauthen-radius-perl/current/LICENSE?rev=42050&op=file
==============================================================================
--- branches/upstream/libauthen-radius-perl/current/LICENSE (added)
+++ branches/upstream/libauthen-radius-perl/current/LICENSE Tue Aug 18 11:40:38 2009
@@ -1,0 +1,75 @@
+This program, Authen::Radius module, is distributed under the
+Perl Artistic License v2.0
+-------------------------------------------------------------------------------
+Copyright (c) 2000-2006, The Perl Foundation.
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+Preamble
+
+This license establishes the terms under which a given free software Package may be copied, modified, distributed, and/or redistributed. The intent is that the Copyright Holder maintains some artistic control over the development of that Package while still keeping the Package available as open source and free software.
+
+You are always permitted to make arrangements wholly outside of this license directly with the Copyright Holder of a given Package. If the terms of this license do not permit the full use that you propose to make of the Package, you should contact the Copyright Holder and seek a different licensing arrangement.
+Definitions
+
+"Copyright Holder" means the individual(s) or organization(s) named in the copyright notice for the entire Package.
+
+"Contributor" means any party that has contributed code or other material to the Package, in accordance with the Copyright Holder's procedures.
+
+"You" and "your" means any person who would like to copy, distribute, or modify the Package.
+
+"Package" means the collection of files distributed by the Copyright Holder, and derivatives of that collection and/or of those files. A given Package may consist of either the Standard Version, or a Modified Version.
+
+"Distribute" means providing a copy of the Package or making it accessible to anyone else, or in the case of a company or organization, to others outside of your company or organization.
+
+"Distributor Fee" means any fee that you charge for Distributing this Package or providing support for this Package to another party. It does not mean licensing fees.
+
+"Standard Version" refers to the Package if it has not been modified, or has been modified only in ways explicitly requested by the Copyright Holder.
+
+"Modified Version" means the Package, if it has been changed, and such changes were not explicitly requested by the Copyright Holder.
+
+"Original License" means this Artistic License as Distributed with the Standard Version of the Package, in its current version or as it may be modified by The Perl Foundation in the future.
+
+"Source" form means the source code, documentation source, and configuration files for the Package.
+
+"Compiled" form means the compiled bytecode, object code, binary, or any other form resulting from mechanical transformation or translation of the Source form.
+Permission for Use and Modification Without Distribution
+
+(1) You are permitted to use the Standard Version and create and use Modified Versions for any purpose without restriction, provided that you do not Distribute the Modified Version.
+Permissions for Redistribution of the Standard Version
+
+(2) You may Distribute verbatim copies of the Source form of the Standard Version of this Package in any medium without restriction, either gratis or for a Distributor Fee, provided that you duplicate all of the original copyright notices and associated disclaimers. At your discretion, such verbatim copies may or may not include a Compiled form of the Package.
+
+(3) You may apply any bug fixes, portability changes, and other modifications made available from the Copyright Holder. The resulting Package will still be considered the Standard Version, and as such will be subject to the Original License.
+Distribution of Modified Versions of the Package as Source
+
+(4) You may Distribute your Modified Version as Source (either gratis or for a Distributor Fee, and with or without a Compiled form of the Modified Version) provided that you clearly document how it differs from the Standard Version, including, but not limited to, documenting any non-standard features, executables, or modules, and provided that you do at least ONE of the following:
+
+(a) make the Modified Version available to the Copyright Holder of the Standard Version, under the Original License, so that the Copyright Holder may include your modifications in the Standard Version.
+(b) ensure that installation of your Modified Version does not prevent the user installing or running the Standard Version. In addition, the Modified Version must bear a name that is different from the name of the Standard Version.
+(c) allow anyone who receives a copy of the Modified Version to make the Source form of the Modified Version available to others under
+(i) the Original License or
+(ii) a license that permits the licensee to freely copy, modify and redistribute the Modified Version using the same licensing terms that apply to the copy that the licensee received, and requires that the Source form of the Modified Version, and of any works derived from it, be made freely available in that license fees are prohibited but Distributor Fees are allowed.
+Distribution of Compiled Forms of the Standard Version or Modified Versions without the Source
+
+(5) You may Distribute Compiled forms of the Standard Version without the Source, provided that you include complete instructions on how to get the Source of the Standard Version. Such instructions must be valid at the time of your distribution. If these instructions, at any time while you are carrying out such distribution, become invalid, you must provide new instructions on demand or cease further distribution. If you provide valid instructions or cease distribution within thirty days after you become aware that the instructions are invalid, then you do not forfeit any of your rights under this license.
+
+(6) You may Distribute a Modified Version in Compiled form without the Source, provided that you comply with Section 4 with respect to the Source of the Modified Version.
+Aggregating or Linking the Package
+
+(7) You may aggregate the Package (either the Standard Version or Modified Version) with other packages and Distribute the resulting aggregation provided that you do not charge a licensing fee for the Package. Distributor Fees are permitted, and licensing fees for other components in the aggregation are permitted. The terms of this license apply to the use and Distribution of the Standard or Modified Versions as included in the aggregation.
+
+(8) You are permitted to link Modified and Standard Versions with other works, to embed the Package in a larger work of your own, or to build stand-alone binary or bytecode versions of applications that include the Package, and Distribute the result without restriction, provided the result does not expose a direct interface to the Package.
+Items That are Not Considered Part of a Modified Version
+
+(9) Works (including, but not limited to, modules and scripts) that merely extend or make use of the Package, do not, by themselves, cause the Package to be a Modified Version. In addition, such works are not considered parts of the Package itself, and are not subject to the terms of this license.
+General Provisions
+
+(10) Any use, modification, and distribution of the Standard or Modified Versions is governed by this Artistic License. By using, modifying or distributing the Package, you accept this license. Do not use, modify, or distribute the Package, if you do not accept this license.
+
+(11) If your Modified Version has been derived from a Modified Version made by someone other than you, you are nevertheless required to ensure that your Modified Version complies with the requirements of this license.
+
+(12) This license does not grant you the right to use any trademark, service mark, tradename, or logo of the Copyright Holder.
+
+(13) This license includes the non-exclusive, worldwide, free-of-charge patent license to make, have made, use, offer to sell, sell, import and otherwise transfer the Package with respect to any patent claims licensable by the Copyright Holder that are necessarily infringed by the Package. If you institute patent litigation (including a cross-claim or counterclaim) against any party alleging that the Package constitutes direct or contributory patent infringement, then this Artistic License to you shall terminate on the date that such litigation is filed.
+
+(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: branches/upstream/libauthen-radius-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libauthen-radius-perl/current/MANIFEST?rev=42050&op=diff
==============================================================================
--- branches/upstream/libauthen-radius-perl/current/MANIFEST (original)
+++ branches/upstream/libauthen-radius-perl/current/MANIFEST Tue Aug 18 11:40:38 2009
@@ -1,5 +1,7 @@
Changes
Makefile.PL
+LICENSE
MANIFEST
Radius.pm
test.pl
+install-radius-db.PL
Modified: branches/upstream/libauthen-radius-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libauthen-radius-perl/current/README?rev=42050&op=diff
==============================================================================
--- branches/upstream/libauthen-radius-perl/current/README (original)
+++ branches/upstream/libauthen-radius-perl/current/README Tue Aug 18 11:40:38 2009
@@ -1,4 +1,4 @@
-This is RadiusPerl version 0.13. RadiusPerl is a Perl 5 module (Radius.pm)
+This is RadiusPerl version 0.14. RadiusPerl is a Perl 5 module (Radius.pm)
which allows you to communicate with a Radius server from Perl. You can
just authenticate usernames/passwords via Radius, or comletely imitate
AAA requests and process server response.
@@ -19,8 +19,11 @@
send them to carl at miskatonic.inbe.net or to the andrew at portaone.com (current
maintainer of the module).
-RadiusPerl is (c)1997 Carl Declerck. See the Perl Artistic License for
-copying and usage policy.
+RadiusPerl is (c)1997 Carl Declerck.
+
+See the Perl Artistic License 2.0
+(http://www.perlfoundation.org/artistic_license_2_0) for copying and
+usage policy.
That's it!
Modified: branches/upstream/libauthen-radius-perl/current/Radius.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libauthen-radius-perl/current/Radius.pm?rev=42050&op=diff
==============================================================================
--- branches/upstream/libauthen-radius-perl/current/Radius.pm (original)
+++ branches/upstream/libauthen-radius-perl/current/Radius.pm Tue Aug 18 11:40:38 2009
@@ -12,7 +12,7 @@
# See the file 'Changes' in the distrution archive. #
# #
#############################################################################
-# $Id: Radius.pm,v 1.17 2007/02/20 06:15:04 andrew Exp $
+# $Id: Radius.pm,v 1.20 2009/07/23 12:27:46 psv Exp $
package Authen::Radius;
@@ -32,7 +32,7 @@
@EXPORT = qw(ACCESS_REQUEST ACCESS_ACCEPT ACCESS_REJECT
ACCOUNTING_REQUEST ACCOUNTING_RESPONSE ACCOUNTING_STATUS
DISCONNECT_REQUEST);
-$VERSION = '0.13';
+$VERSION = '0.14';
my (%dict_id, %dict_name, %dict_val, %dict_vendor_id, %dict_vendor_name );
my ($request_id) = $$ & 0xff; # probably better than starting from 0
@@ -99,11 +99,14 @@
}
sub send_packet {
- my ($self, $type) = @_;
+ my ($self, $type, $retransmit) = @_;
my ($data);
my $length = 20 + length($self->{'attributes'});
- $self->set_error;
+ if (!$retransmit) {
+ $request_id = ($request_id + 1) & 0xff;
+ }
+ $self->set_error;
if ($type == ACCOUNTING_REQUEST || $type == DISCONNECT_REQUEST) {
$self->{'authenticator'} = "\0" x 16;
$self->{'authenticator'} =
@@ -113,17 +116,16 @@
}
$data = pack('C C n', $type, $request_id, $length)
. $self->{'authenticator'} . $self->{'attributes'};
- $request_id = ($request_id + 1) & 0xff;
if ($debug) {
print STDERR "Sending request:\n";
print STDERR HexDump($data);
}
- $self->{'sock'}->send ($data) || $self->set_error('ESENDFAIL');
+ $self->{'sock'}->send($data) || $self->set_error('ESENDFAIL');
}
sub recv_packet {
- my ($self) = @_;
- my ($data, $type, $id, $length, $auth, $sh);
+ my ($self, $detect_bad_id) = @_;
+ my ($data, $type, $id, $length, $auth, $sh, $resp_attributes);
$self->set_error;
@@ -135,15 +137,23 @@
print STDERR "Received response:\n";
print STDERR HexDump($data);
}
- ($type, $id, $length, $auth, $self->{'attributes'}) = unpack('C C n a16 a*', $data);
- return $self->set_error('EBADAUTH') if $auth ne $self->calc_authenticator($type, $id, $length);
-
- $type;
+ ($type, $id, $length, $auth, $resp_attributes ) = unpack('C C n a16 a*', $data);
+ if ($detect_bad_id && defined($id) && ($id != $request_id) ) {
+ return $self->set_error('EBADID');
+ }
+
+ if ($auth ne $self->calc_authenticator($type, $id, $length, $resp_attributes)) {
+ return $self->set_error('EBADAUTH');
+ }
+ # rewrtite attributes only in case of valid response
+ $self->{'attributes'} = $resp_attributes;
+ return $type;
}
sub check_pwd {
my ($self, $name, $pwd, $nas) = @_;
+ $nas = eval { $self->{'sock'}->sockhost() } unless defined($nas);
$self->clear_attributes;
$self->add_attributes (
{ Name => 1, Value => $name, Type => 'string' },
@@ -293,15 +303,16 @@
sub calc_authenticator {
- my ($self, $type, $id, $length) = @_;
+ my ($self, $type, $id, $length, $attributes) = @_;
my ($hdr, $ct);
$self->set_error;
$hdr = pack('C C n', $type, $id, $length);
$ct = Digest::MD5->new;
- $ct->add ($hdr, $self->{'authenticator'}, $self->{'attributes'}, $self->{'secret'});
-
+ $ct->add ($hdr, $self->{'authenticator'},
+ (defined($attributes)) ? $attributes : $self->{'attributes'},
+ $self->{'secret'});
$ct->digest();
}
@@ -411,7 +422,8 @@
'EBADAUTH', 'bad response authenticator',
'ESENDFAIL', 'send failed',
'ERECVFAIL', 'receive failed',
- 'EBADSERV', 'unrecognized service'
+ 'EBADSERV', 'unrecognized service',
+ 'EBADID', 'response to unknown request'
);
return $errors{$radius_error} unless ref($self);
@@ -492,8 +504,9 @@
=item check_pwd ( USERNAME, PASSWORD [,NASIPADDRESS] )
Checks with the Radius server if the specified C<PASSWORD> is valid for user
-C<USERNAME>. Unless C<NASIPADDRESS> is soecified, 127.0.0.1 will
-be placed in the NAS-IP-Address attribute.
+C<USERNAME>. Unless C<NASIPADDRESS> is specified, the script will attempt
+to determine it's local IP address (IP address for the RADIUS socket) and
+this value will be placed in the NAS-IP-Address attribute.
This method is actually a wrapper for subsequent calls to
C<clear_attributes>, C<add_attributes>, C<send_packet> and C<recv_packet>. It
returns 1 if the C<PASSWORD> is correct, or undef otherwise.
@@ -520,7 +533,7 @@
Clears all attributes for the current object.
-=item send_packet ( REQUEST_TYPE )
+=item send_packet ( REQUEST_TYPE, RETRANSMIT )
Packs up a Radius packet based on the current secret & attributes and
sends it to the server with a Request type of C<REQUEST_TYPE>. Exported
@@ -529,13 +542,23 @@
and 'C<DISCONNECT_REQUEST>'.
Returns the number of bytes sent, or undef on failure.
-=item recv_packet
+If the RETRANSMIT parameter is provided and contains a non-zero value, then
+it is considered that we are re-sending the request, which was already sent
+previously. In this case the previous value of packet indentifier is used.
+
+=item recv_packet ( DETECT_BAD_ID )
Receives a Radius reply packet. Returns the Radius Reply type (see possible
values for C<REQUEST_TYPE> in method C<send_packet>) or undef on failure. Note
that failure may be due to a failed recv() or a bad Radius response
authenticator. Use C<get_error> to find out.
+If the DETECT_BAD_ID parameter is provided and contains a non-zero value, then
+mathing of packet indentifier is performed before authenticator check and EBADID
+error returned in case when packet indentifier from response doesn't match to
+request. If the DETECT_BAD_ID is not provided or contains zero value then
+EBADAUTH returned in such case.
+
=item get_error
Returns the last C<ERRORCODE> for the current object. Errorcodes are one-word
More information about the Pkg-perl-cvs-commits
mailing list