ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove Persona support

Browse Source 
Persona is no longer supported by Mozilla, so let's remove it.
This commit is contained in:
Eelco Dolstra
2016-10-20 14:14:04 +02:00
parent e0b2921ff2
commit bbe45ed844
7 changed files with 14 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/Hydra/Controller/Root.pm
View File

@ -18,8 +18,7 @@ __PACKAGE__->config->{namespace} = '';
sub noLoginNeeded {
my ($c) = @_;
return $c->request->path eq "persona-login" ||
$c->request->path eq "google-login" ||
return $c->request->path eq "google-login" ||
$c->request->path eq "login" ||
$c->request->path eq "logo" ||
$c->request->path =~ /^static\//;

29
src/lib/Hydra/Controller/User.pm
View File

@ -54,10 +54,10 @@ sub doEmailLogin {
# in URLs.
die "Illegal email address.\n" unless $email =~ /^[a-zA-Z0-9\.\-\_]+@[a-zA-Z0-9\.\-\_]+$/;
# If persona_allowed_domains is set, check if the email address
# If allowed_domains is set, check if the email address
# returned is on these domains. When not configured, allow all
# domains.
my $allowed_domains = $c->config->{persona_allowed_domains} || "";
my $allowed_domains = $c->config->{allowed_domains} // ($c->config->{persona_allowed_domains} // "");
if ($allowed_domains ne "") {
my $email_ok = 0;
my @domains = split ',', $allowed_domains;
@ -73,7 +73,7 @@ sub doEmailLogin {
my $user = $c->find_user({ username => $email });
if ($user) {
# Automatically upgrade Persona accounts to Google accounts.
# Automatically upgrade legacy Persona accounts to Google accounts.
if ($user->type eq "persona" && $type eq "google") {
$user->update({type => "google"});
}
@ -97,29 +97,6 @@ sub doEmailLogin {
}
sub persona_login :Path('/persona-login') Args(0) {
my ($self, $c) = @_;
requirePost($c);
error($c, "Logging in via Persona is not enabled.") unless $c->config->{enable_persona};
my $assertion = $c->stash->{params}->{assertion} or die;
my $ua = new LWP::UserAgent;
my $response = $ua->post(
'https://verifier.login.persona.org/verify',
{ assertion => $assertion,
audience => $c->uri_for('/')
});
error($c, "Did not get a response from Persona.") unless $response->is_success;
my $d = decode_json($response->decoded_content) or die;
error($c, "Persona says: $d->{reason}") if $d->{status} ne "okay";
doEmailLogin($self, $c, "persona", $d->{email}, undef);
}
sub google_login :Path('/google-login') Args(0) {
my ($self, $c) = @_;
requirePost($c);