Changeset 15866 for lang/perl/Apache2-AuthenOpenID

Timestamp:

07/16/08 00:04:29 (4 months ago)

Author:

lopnor

Message:

lang/perl/Apache2-AuthenOpenID: merged per_dir_config branch to trunk

Files:

• lang/perl/Apache2-AuthenOpenID/trunk/lib/Apache2/AuthenOpenID.pm (modified) (7 diffs)

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

@@ -60 +60 @@
 sub return_to {
     my ($self, $params, $arg) = @_;
-    my $class = ref $self;
-    my $i = Apache2::Module::get_config($class, $params->server);
-    $i->{'return_to'} = $arg;
+    $self->{'return_to'} = $arg;
 }
 
 sub trust_root {
     my ($self, $params, $arg) = @_;
-    my $class = ref $self;
-    my $i = Apache2::Module::get_config($class, $params->server);
-    $i->{'trust_root'} = $arg;
+    $self->{'trust_root'} = $arg;
 }
 
 sub consumer_secret {
     my ($self, $params, $arg) = @_;
-    my $class = ref $self;
-    my $i = Apache2::Module::get_config($class, $params->server);
-    $i->{'consumer_secret'} = $arg;
+    $self->{'consumer_secret'} = $arg;
 }
 
@@ -82 +76 @@
     my ($self, $r) = @_;
     lc $r->auth_type eq lc $self->auth_type or return Apache2::Const::DECLINED;
-    my $cf = Apache2::Module::get_config($self, $r->server);
+
+    my $cf = Apache2::Module::get_config($self, $r->server, $r->per_dir_config);
+    $r->log->debug(
+       sprintf "tr=%s rt=%s cs=%s", $cf->{'trust_root'}, $cf->{'return_to'}, $cf->{'consumer_secret'}
+    );
     unless ($cf->{'trust_root'} && $cf->{'return_to'} && $cf->{'consumer_secret'}) {
         $r->log_error("You need to specify trust_root, return_to, and consumer_secret.");
@@ -101 +99 @@
         . $r->uri;
 
-    my $q = CGI->new($r);
     my %cookie_in = CGI::Cookie->parse($r->headers_in->{Cookie});
 
-    my $csr = Net::OpenID::Consumer->new(
-        args => $q,
-        ua => LWPx::ParanoidAgent->new,
-        consumer_secret => $cf->{'consumer_secret'},
-    );
     if ($request_url eq $cf->{'return_to'}) {
+        my $q = CGI->new($r);
+        my $csr = Net::OpenID::Consumer->new(
+            args            => $q,
+            ua              => LWPx::ParanoidAgent->new,
+            consumer_secret => $cf->{'consumer_secret'},
+        );
+
+        $r->log->debug("$request_url is return_to");
         if (my $identity = $q->param('identity')) {
             my $claimed_identity = $csr->claimed_identity($identity)
@@ -117 +117 @@
                 trust_root => $cf->{'trust_root'},
             );
+            $r->log->debug("clamed_identity=$claimed_identity  check_url=$check_url");
             $r->err_headers_out->set(Location => $check_url);
             return Apache2::Const::REDIRECT;
         } elsif (my $setup_url = $csr->user_setup_url) {
+            $r->log->debug("setup_url=$setup_url");
             $r->err_headers_out->set(Location => $setup_url);
             return Apache2::Const::REDIRECT;
         } elsif ($csr->user_cancel) {
+            $r->log->debug("user_canceled.");
             return Apache2::Const::HTTP_UNAUTHORIZED;
         } elsif (my $vident = $csr->verified_identity) {
+            $r->log->debug('verified_identity');
             my $url = $vident->url;
             $url =~ s{(^https?://|/$)}{}g;
@@ -136 +140 @@
             if (%cookie_in && (my $dest = $cookie_in{$cookie_dest_name})) {
                 $r->headers_out->set('Location' => $dest->value);
+                $r->log->debug('return to cookie_dest='. $dest->value);
             } else {
                 $r->headers_out->set('Location' => $cf->{'trust_root'});
+                $r->log->debug('redirect to trust_root');
             }
             my $cookie_dest_erase = CGI::Cookie->new(
@@ -148 +154 @@
             return Apache2::Const::REDIRECT;
         }
+
+        $r->log_error("Error validating identity: " . $csr->err);
         return Apache2::Const::HTTP_UNAUTHORIZED;
     }
@@ -170 +178 @@
 sub set_custom_response {
     my ($self, $r) = @_;
-    my $cf = Apache2::Module::get_config($self, $r->server);
+    my $cf = Apache2::Module::get_config($self, $r->server, $r->per_dir_config);
     my $auth_name = $r->auth_name;
     my $html = <<END;