Changeset 1263 for lang/perl/Apache2-AuthenOpenID

Timestamp:

11/10/07 12:31:02 (13 months ago)

Author:

lopnor

Message:

lang/perl/Apache2-AuthenOpenID: made inheritable

Location:

lang/perl/Apache2-AuthenOpenID/trunk

Files:

• Changes (modified) (1 diff)
• Makefile.PL (modified) (1 diff)
• lib/Apache2/AuthenOpenID.pm (modified) (5 diffs)

lang/perl/Apache2-AuthenOpenID/trunk/Changes

@@ -1 +1 @@
 Revision history for Perl extension Apache2::AuthenOpenID.
+
+0.04  Sat Nov 10 12:21:00 JST 2007
+    - made inheritable
 
 0.03  Mon Oct 16 09:30:00 2007

lang/perl/Apache2-AuthenOpenID/trunk/Makefile.PL

@@ -9 +9 @@
         mod_perl2 => 2.000001,
         CGI => 0,
-        Net::OpenID::Consumer => 0.14,,
+        Net::OpenID::Consumer => 0.14,
         Digest::HMAC_SHA1 => 1.01,
         LWPx::ParanoidAgent => 1.03,
+        Class::Data::Inheritable => 0,
     }, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005

lang/perl/Apache2-AuthenOpenID/trunk/lib/Apache2/AuthenOpenID.pm

@@ -16 +16 @@
 use Digest::HMAC_SHA1;
 use LWPx::ParanoidAgent;
-
-our $VERSION = '0.03';
-
-my @directives = (
-    {
-        name            => 'AuthType',
-        func            => __PACKAGE__ . '::AuthType',
-        req_override    => Apache2::Const::OR_AUTHCFG,
-        args_how        => Apache2::Const::TAKE1,
-    },
-    {
-        name            => 'return_to',
-        func            => __PACKAGE__ . '::return_to',
-        req_override    => Apache2::Const::OR_AUTHCFG,
-        args_how        => Apache2::Const::TAKE1,
-        errmsg          => 'return_to http://sample.com/trust_root/callback',
-    },
-    {
-        name            => 'trust_root',
-        func            => __PACKAGE__ . '::trust_root',
-        req_override    => Apache2::Const::OR_AUTHCFG,
-        args_how        => Apache2::Const::TAKE1,
-        errmsg          => 'return_to http://sample.com/trust_root/',
-    },
-    {
-        name            => 'consumer_secret',
-        func            => __PACKAGE__ . '::consumer_secret',
-        req_override    => Apache2::Const::OR_AUTHCFG,
-        args_how        => Apache2::Const::TAKE1,
-        errmsg          => 'consumer_secret "Your consumer secret goes here"',
-    },
-);
-
-eval { Apache2::Module::add(__PACKAGE__, \@directives); };
+use base qw( Class::Data::Inheritable );
+
+our $VERSION = '0.04';
+
+__PACKAGE__->mk_classdata( auth_type => 'openid' );
+__PACKAGE__->init;
+
+
+sub init {
+    my $self = shift;
+
+    my @directives = (
+        {
+            name            => 'AuthType',
+            req_override    => Apache2::Const::OR_AUTHCFG,
+            args_how        => Apache2::Const::TAKE1,
+        },
+        {
+            name            => 'return_to',
+            req_override    => Apache2::Const::OR_AUTHCFG,
+            args_how        => Apache2::Const::TAKE1,
+            errmsg          => 'return_to http://sample.com/trust_root/callback',
+        },
+        {
+            name            => 'trust_root',
+            req_override    => Apache2::Const::OR_AUTHCFG,
+            args_how        => Apache2::Const::TAKE1,
+            errmsg          => 'return_to http://sample.com/trust_root/',
+        },
+        {
+            name            => 'consumer_secret',
+            req_override    => Apache2::Const::OR_AUTHCFG,
+            args_how        => Apache2::Const::TAKE1,
+            errmsg          => 'consumer_secret "Your consumer secret goes here"',
+        },
+    );
+
+    eval { 
+        Apache2::Module::add($self, \@directives); 
+    };
+}
 
 sub AuthType {
-    my ($i, $params, $arg) = @_;
-    if ($arg =~ /^OpenID$/i) {
+    my ($self, $params, $arg) = @_;
+    my $class = ref $self;
+    if (lc $arg eq lc $self->auth_type) {
         Apache2::ServerUtil->server->push_handlers(
-            PerlAuthenHandler => __PACKAGE__,
+            PerlAuthenHandler => $class,
         );
     }
@@ -61 +69 @@
 
 sub return_to {
-    my ($i, $params, $arg) = @_;
-    $i = Apache2::Module::get_config(__PACKAGE__, $params->server);
+    my ($self, $params, $arg) = @_;
+    my $class = ref $self;
+    my $i = Apache2::Module::get_config($class, $params->server);
     $i->{'return_to'} = $arg;
 }
 
 sub trust_root {
-    my ($i, $params, $arg) = @_;
-    $i = Apache2::Module::get_config(__PACKAGE__, $params->server);
+    my ($self, $params, $arg) = @_;
+    my $class = ref $self;
+    my $i = Apache2::Module::get_config($class, $params->server);
     $i->{'trust_root'} = $arg;
 }
 
 sub consumer_secret {
-    my ($i, $params, $arg) = @_;
-    $i = Apache2::Module::get_config(__PACKAGE__, $params->server);
+    my ($self, $params, $arg) = @_;
+    my $class = ref $self;
+    my $i = Apache2::Module::get_config($class, $params->server);
     $i->{'consumer_secret'} = $arg;
 }
@@ -80 +91 @@
 sub handler : method {
     my ($self, $r) = @_;
-warn $self;
-warn __PACKAGE__;
-    $r->auth_type =~ m{^OpenID$}i or return Apache2::Const::DECLINED;
-
-    my $cf = Apache2::Module::get_config(__PACKAGE__, $r->server);
+    lc $r->auth_type eq lc $self->auth_type or return Apache2::Const::DECLINED;
+    my $cf = Apache2::Module::get_config($self, $r->server);
     unless ($cf->{'trust_root'} && $cf->{'return_to'} && $cf->{'consumer_secret'}) {
         $r->log_error("You need to specify trust_root, return_to, and consumer_secret.");
         die;
     }
-
-    (my $cookie_name = __PACKAGE__."-".$r->auth_name) =~ s/(::|\s+)/-/g;
+    (my $cookie_name = $self."-".$r->auth_name) =~ s/(::|\s+)/-/g;
     my $cookie_dest_name = $cookie_name.'-destination';
     $self->set_custom_response($r);
@@ -172 +179 @@
 
 sub set_custom_response {
-    my $self = shift;
-    my $r = shift;
-    my $cf = Apache2::Module::get_config(__PACKAGE__, $r->server);
+    my ($self, $r) = @_;
+    my $cf = Apache2::Module::get_config($self, $r->server);
     my $auth_name = $r->auth_name;
     my $html = <<END;
@@ -220 +226 @@
 
 sub calc_token {
-    my ($url, $time, $consumer_secret) = @_;
+    my ($self, $url, $time, $consumer_secret) = @_;
     my $context = Digest::HMAC_SHA1->new($consumer_secret);
     $context->add($url);