{"header":{"message":"Add support for logging in via a Google account","description":"The required configuration in hydra.conf:\n\n enable_google_login = 1\n google_client_id = 238429sdjkds....apps.googleusercontent.com\n\nand optionally persona_allowed_domains to restrict to one or more\ndomains.","timestamp":"2016-01-13T16:32:52Z","authors":[{"email":"eelco.dolstra@logicblox.com","name":"Eelco Dolstra"}]},"hash":"3QWDDLBR5DGFK5Y3TDMK55R2SCHRHFVO2KW2BMZGIYRTIQEZC45AC","authors":[],"deps":{"hashes":[["3QWDDLBR5DGFK5Y3TDMK55R2SCHRHFVO2KW2BMZGIYRTIQEZC45AC","Add support for logging in via a Google account"],["AA",null],["GS4SFHCPF76AX2U4NLLJGUISF6Y4AHYWEW3GLTDCKVDDXLSIGXUQC","templates: Use uri_for to reference static paths."],["Z4NL5TWBVTPUTDYAE7YH7C5OPWLF5JKGFEDLYWD5OX4TISW67CUAC","Fix audience URL"],["IFY7BYPSDD4FA7LYXENS7DUTGKOKZSS6U5C2LVC26UOJAX3GIMXQC","User.pm: Handle params from JSON properly"],["HL6ZYWHFSOSTGCUEP2K554F5OY4RWAHJYS2MA2V3JMZIG262LFKAC","Allow configuring a set of domains to allow logins from Persona."],["2DHE2ZAKR4AU7OE6E5CYNFWVGQXLHEX5LFKVU43PMBVX3QW6RHFAC","Allow Hydra to run as a private instance by requiring a login."],["XOOSZ3WSJVMXS2ZMAS64QYUGAIBOMU5754QDSRB2AYDKGVNNH2FAC","Only include Persona JS when Persona is enabled"],["J5UVLXOK6EDIL5I7VKWH4V2QDS4DPD7FHRK6XBWSXFRQS4JKXFZQC","* Start of a basic Catalyst web interface."],["MGOGOKQPECPTSG66DV7QXJHY3SXUJVHPGRWPCY4JMMNRQSDE564AC","add tracker html code via HYDRA_TRACKER"],["XJRJ4J7M6BC433TBLWHHKX7UYYCFX6M7ZQLUEYYTREPCSM6M3RDQC","Add user registration"],["JFW656FT5JSDCA5NBNFGTJABIR2LR5VRDRYI7KF54PYNFDSL4DMAC","Add a flag to enable Persona support"],["G4X5IUYJHZSEXAGFG5DRIJEHFBSQDQ2UTIJ4FCILIPZAUHGQ3GTQC","Remove default logo, replaced by text for now. Hide template in jobset edit."],["36ZTCZ4FDV6ILURQEIGFHCP57ALZH6OWYNN3MBXG2QXZSBULBPMAC","Add basic Persona support"],["JARRBLZDQ2JZWY7IUVPTOT7WJMBPMLFLF2MGLVGOYROAAISYGLSAC","Bootstrapify the Hydra forms (except the project and jobset edit pages)"],["LZVO64YG43JD7YMZSCTZNOBS5ROZA4FMPKJW2YOMHX2V5PTGBVWQC","Merge in the first bits of the API work"],["BW6TYQJSQR3745SIUZ2MHORHASUSHCSOGF7V6UFDOJK4RGUMEEGAC","Use local copy of the Persona sign in button"],["YM27DTVTXF3T7OTEK36JZNOP7SIHMPSZMF4LDZYVA3PQKXGYLPFQC","Remove superfluous HYDRA_LOGO environment variable"],["P75LFRF4GMC5KSIHC4XDBFRYIO36XUABQ2BN3EJXL42764BFAZUAC","Slight cleanup in the Persona sign in code"],["XMB4MTRLVDDXF6ISVXXEKEFU2KRTQHHV3UJEWRXQOZAOYAEFPQBAC","Show sign in as success"],["WDKFN4B2M7BUF4S7X6YA5AKHOJKHLG65LWNQVOSIBTKFEZELBMKAC","Make sign in a modal dialog box rather than a separate page"],["2CZSW5S53UW7ACDNT5T3UQNJKFBCXCBYLQ5CL6GVCCOMKBGXZIEQC","Don't redirect to /login if authentication is required"],["VVRM3EGCPCYA3GQEGZUEMOGEEYTMMUZK46UFU3R46AKZC62ZEMRQC","Link to both the Persona and legacy sign in"],["QL55ECJ6KMMBUOWQ6LKSOVN7L43CH4S6SPE2AQ3VX3KSGC32RP4AC","- adapted ui for hydra, more in line with nixos.org website"],["DV43UILUJNNU4DJMQ5NIZ2TY5Y4NOPQZXXQQJNKINUKA2VBAJ2QAC","Don't float the search bar to the right in collapsed mode"],["2G63HKCHG7S6DGWDOHSDF7PXFPD6H4TRKDKIIFCXXAKET6FCWN2AC","Fix some wellformedness issues"],["MQMF2LBWWPW2SOZKC3O7P4TBJJ3V6RBVQ52OYA4KCGXS7G6SHWQAC","Re-enable adding new users via the web interface"],["X5BWNTMAPH7E44CW656IVVUIY24RIIDIWKTRKWCQZZDT7Y77NBLQC","Make the logo configurable via hydra.conf"],["R6APT7HGJLNLS4RZRBQHVO2EVZSXNPPNEJPZ3WQNH2DM3YII6LTQC","Fix hydra_logo setting"],["D44B24QC6NCED6DVUYP2IJJEVBG2JNBKPBRRSLI5UXQTKA23DJQQC","Store the account type (\"hydra\" or \"persona\") explicitly in the database"],["OEPUOUNBNTHTFZVDXREGBQCKFRCWMVP2MDVK4OA47VK2DBKEWVYAC","Using twitter bootstrap for more consistent looks for Hydra"],["QVIQAYZTTDRODPFP6HCWOETJ2OYLECU34FD4K5YKL7ENLG6HI3GAC","Be paranoid about the Persona email address"],["PFB5ZUQWW67FRYY54QGTAVTWYMUKXLXRA2XCY3IWK6HZNE6DDLFAC","Fix legacy login"],["T4LLYESZ2HUXSLKZ6GNBLVWUVG7R5IDFHYHYO773QIZ6QTOOXR2AC","* Nix expression for building Hydra."],["6K5PBUUN4GQAMOVX5BS6YYMHJ3PIF2PPZBTIEQ4R7BQNHC23GS3AC","Use buildEnv to combine Hydra's Perl dependencies"],["LSZLZHJYGXZTCNH4JUXU7W23MW5PBVM4OBMWRRVNEDROMIBUVQNAC","Allow users to edit their own settings"],["D5QIOJGPKQJIYBUCSC3MFJ3TXLPNZ2XMI37GXMFRVRFWWR2VMTFAC","* Move everything up one directory."],["4JPNFWRBFCFER74NDL3XZXNQ25YQCPD7E4XKYKF7VCWIESE56G4AC","* Use jquery for the logfile manipulation."],["SZYDW2DG5Z7BR3ICKWDXVUNSMCDSXMYZUB6FQ4W2B2FVZJD6PULQC","hydra: added some user admin"]],"deps":["GS4SFHCPF76AX2U4NLLJGUISF6Y4AHYWEW3GLTDCKVDDXLSIGXUQC","Z4NL5TWBVTPUTDYAE7YH7C5OPWLF5JKGFEDLYWD5OX4TISW67CUAC","IFY7BYPSDD4FA7LYXENS7DUTGKOKZSS6U5C2LVC26UOJAX3GIMXQC","HL6ZYWHFSOSTGCUEP2K554F5OY4RWAHJYS2MA2V3JMZIG262LFKAC","2DHE2ZAKR4AU7OE6E5CYNFWVGQXLHEX5LFKVU43PMBVX3QW6RHFAC","XOOSZ3WSJVMXS2ZMAS64QYUGAIBOMU5754QDSRB2AYDKGVNNH2FAC"],"known":["J5UVLXOK6EDIL5I7VKWH4V2QDS4DPD7FHRK6XBWSXFRQS4JKXFZQC","QL55ECJ6KMMBUOWQ6LKSOVN7L43CH4S6SPE2AQ3VX3KSGC32RP4AC","MGOGOKQPECPTSG66DV7QXJHY3SXUJVHPGRWPCY4JMMNRQSDE564AC","OEPUOUNBNTHTFZVDXREGBQCKFRCWMVP2MDVK4OA47VK2DBKEWVYAC","G4X5IUYJHZSEXAGFG5DRIJEHFBSQDQ2UTIJ4FCILIPZAUHGQ3GTQC","JARRBLZDQ2JZWY7IUVPTOT7WJMBPMLFLF2MGLVGOYROAAISYGLSAC","XJRJ4J7M6BC433TBLWHHKX7UYYCFX6M7ZQLUEYYTREPCSM6M3RDQC","DV43UILUJNNU4DJMQ5NIZ2TY5Y4NOPQZXXQQJNKINUKA2VBAJ2QAC","LZVO64YG43JD7YMZSCTZNOBS5ROZA4FMPKJW2YOMHX2V5PTGBVWQC","2G63HKCHG7S6DGWDOHSDF7PXFPD6H4TRKDKIIFCXXAKET6FCWN2AC","36ZTCZ4FDV6ILURQEIGFHCP57ALZH6OWYNN3MBXG2QXZSBULBPMAC","2CZSW5S53UW7ACDNT5T3UQNJKFBCXCBYLQ5CL6GVCCOMKBGXZIEQC","XMB4MTRLVDDXF6ISVXXEKEFU2KRTQHHV3UJEWRXQOZAOYAEFPQBAC","PFB5ZUQWW67FRYY54QGTAVTWYMUKXLXRA2XCY3IWK6HZNE6DDLFAC","VVRM3EGCPCYA3GQEGZUEMOGEEYTMMUZK46UFU3R46AKZC62ZEMRQC","D44B24QC6NCED6DVUYP2IJJEVBG2JNBKPBRRSLI5UXQTKA23DJQQC","MQMF2LBWWPW2SOZKC3O7P4TBJJ3V6RBVQ52OYA4KCGXS7G6SHWQAC","WDKFN4B2M7BUF4S7X6YA5AKHOJKHLG65LWNQVOSIBTKFEZELBMKAC","P75LFRF4GMC5KSIHC4XDBFRYIO36XUABQ2BN3EJXL42764BFAZUAC","QVIQAYZTTDRODPFP6HCWOETJ2OYLECU34FD4K5YKL7ENLG6HI3GAC","JFW656FT5JSDCA5NBNFGTJABIR2LR5VRDRYI7KF54PYNFDSL4DMAC","X5BWNTMAPH7E44CW656IVVUIY24RIIDIWKTRKWCQZZDT7Y77NBLQC","R6APT7HGJLNLS4RZRBQHVO2EVZSXNPPNEJPZ3WQNH2DM3YII6LTQC","BW6TYQJSQR3745SIUZ2MHORHASUSHCSOGF7V6UFDOJK4RGUMEEGAC","YM27DTVTXF3T7OTEK36JZNOP7SIHMPSZMF4LDZYVA3PQKXGYLPFQC"]},"hunks":[{"Edit":{"inode":{"change":34,"pos":1},"path":"release.nix","line":120,"atom":{"NewVertex":{"up_context":[{"change":35,"pos":556}],"down_context":[{"change":35,"pos":601}],"flag":"BLOCK","start":0,"end":21,"inode":{"change":34,"pos":1}}},"contents":[{"Add":" CryptJWT"}]}},{"Edit":{"inode":{"change":8,"pos":804},"path":"src/lib/Hydra/Controller/Root.pm","line":16,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1084}],"down_context":[{"change":6,"pos":0}],"flag":"BLOCK","start":22,"end":23,"inode":{"change":8,"pos":804}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":8,"pos":804},"path":"src/lib/Hydra/Controller/Root.pm","line":22,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":87}],"down_context":[{"change":6,"pos":87}],"flag":"BLOCK","start":24,"end":72,"inode":{"change":8,"pos":804}}},"contents":[{"Add":" $c->request->path eq \"google-login\" ||"}]}},{"Edit":{"inode":{"change":8,"pos":804},"path":"src/lib/Hydra/Controller/Root.pm","line":40,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":196},"to":{"change":8,"start":0,"end":78},"introduced_by":8}],"inode":{"change":8,"pos":804}}},"contents":[{"Del":" $c->stash->{personaEnabled} = $c->config->{enable_persona} // \"0\" eq \"1\";\n"}]}},{"Edit":{"inode":{"change":8,"pos":804},"path":"src/lib/Hydra/Controller/Root.pm","line":73,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":21615}],"down_context":[{"change":8,"pos":21615}],"flag":"BLOCK","start":73,"end":74,"inode":{"change":8,"pos":804}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":7,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":23630}],"down_context":[{"change":36,"pos":272}],"flag":"BLOCK","start":75,"end":106,"inode":{"change":8,"pos":252}}},"contents":[{"Add":"use Crypt::JWT qw(decode_jwt);"}]}},{"Edit":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":47,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":24932},"to":{"change":8,"start":33,"end":112},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":140},"to":{"change":8,"start":0,"end":21},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21},"to":{"change":8,"start":79,"end":165},"introduced_by":8}],"inode":{"change":8,"pos":252}}},"contents":[{"Del":"\n\nsub persona_login :Path('/persona-login') Args(0) {\n my ($self, $c) = @_;\n"},{"Del":" requirePost($c);\n"},{"Del":"\n error($c, \"Persona support is not enabled.\") unless $c->stash->{personaEnabled};\n"}]}},{"Edit":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":48,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":183},"to":{"change":4,"start":0,"end":61},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":61},"to":{"change":8,"start":240,"end":392},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":240},"to":{"change":8,"start":240,"end":392},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":392},"to":{"change":3,"start":0,"end":39},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":39},"to":{"change":8,"start":439,"end":451},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":439},"to":{"change":8,"start":439,"end":451},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":451},"to":{"change":8,"start":22,"end":106},"introduced_by":8}],"inode":{"change":8,"pos":252}}},"contents":[{"Del":" my $assertion = $c->stash->{params}->{assertion} or die;\n"},{"Del":"\n my $ua = new LWP::UserAgent;\n my $response = $ua->post(\n 'https://verifier.login.persona.org/verify',\n { assertion => $assertion,\n"},{"Del":" audience => $c->uri_for('/')\n"},{"Del":" });\n"},{"Del":" error($c, \"Did not get a response from Persona.\") unless $response->is_success;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":49,"ins":{"up_context":[{"change":8,"pos":1421}],"down_context":[{"change":8,"pos":24933}],"flag":"BLOCK","start":107,"end":177,"inode":{"change":8,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1421},"to":{"change":8,"start":553,"end":613},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":613},"to":{"change":8,"start":107,"end":178},"introduced_by":8}],"inode":{"change":8,"pos":252}},"ins_contents":[{"Add":"sub doEmailLogin {"},{"Add":" my ($self, $c, $type, $email, $fullName) = @_;"}],"del_contents":[{"Del":" my $d = decode_json($response->decoded_content) or die;\n"},{"Del":" error($c, \"Persona says: $d->{reason}\") if $d->{status} ne \"okay\";\n"}]}},{"Replacement":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":52,"ins":{"up_context":[{"change":8,"pos":24934}],"down_context":[{"change":8,"pos":0}],"flag":"BLOCK","start":178,"end":240,"inode":{"change":8,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":24934},"to":{"change":8,"start":702,"end":738},"introduced_by":8}],"inode":{"change":8,"pos":252}},"ins_contents":[{"Add":" die \"No email address provided.\\n\" unless defined $email;"}],"del_contents":[{"Del":" my $email = $d->{email} or die;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":56,"ins":{"up_context":[{"change":8,"pos":85}],"down_context":[{"change":5,"pos":0}],"flag":"BLOCK","start":241,"end":336,"inode":{"change":8,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":85},"to":{"change":8,"start":85,"end":178},"introduced_by":8}],"inode":{"change":8,"pos":252}},"ins_contents":[{"Add":" die \"Illegal email address.\\n\" unless $email =~ /^[a-zA-Z0-9\\.\\-\\_]+@[a-zA-Z0-9\\.\\-\\_]+$/;"}],"del_contents":[{"Del":" die \"Illegal email address.\" unless $email =~ /^[a-zA-Z0-9\\.\\-\\_]+@[a-zA-Z0-9\\.\\-\\_]+$/;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":58,"ins":{"up_context":[{"change":5,"pos":1}],"down_context":[{"change":5,"pos":145}],"flag":"BLOCK","start":337,"end":488,"inode":{"change":8,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1},"to":{"change":5,"start":1,"end":145},"introduced_by":5}],"inode":{"change":8,"pos":252}},"ins_contents":[{"Add":" # If persona_allowed_domains is set, check if the email address"},{"Add":" # returned is on these domains. When not configured, allow all"},{"Add":" # domains."}],"del_contents":[{"Del":" # If persona_allowed_domains is set, check if the email address returned is on these domains.\n # When not configured, allow all domains.\n"}]}},{"Replacement":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":62,"ins":{"up_context":[{"change":5,"pos":216}],"down_context":[{"change":5,"pos":251}],"flag":"BLOCK","start":489,"end":523,"inode":{"change":8,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":216},"to":{"change":5,"start":216,"end":251},"introduced_by":5}],"inode":{"change":8,"pos":252}},"ins_contents":[{"Add":" if ($allowed_domains ne \"\") {"}],"del_contents":[{"Del":" if ( $allowed_domains ne \"\") {\n"}]}},{"Replacement":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":70,"ins":{"up_context":[{"change":5,"pos":505}],"down_context":[{"change":5,"pos":576}],"flag":"BLOCK","start":524,"end":651,"inode":{"change":8,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":505},"to":{"change":5,"start":505,"end":576},"introduced_by":5}],"inode":{"change":8,"pos":252}},"ins_contents":[{"Add":" error($c, \"Your email address does not belong to a domain that is allowed to log in.\\n\")"},{"Add":" unless $email_ok;"}],"del_contents":[{"Del":" die \"Email address is not allowed to login.\" unless $email_ok;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":76,"ins":{"up_context":[{"change":8,"pos":794}],"down_context":[{"change":8,"pos":812}],"flag":"BLOCK","start":652,"end":952,"inode":{"change":8,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":794},"to":{"change":8,"start":794,"end":812},"introduced_by":8}],"inode":{"change":8,"pos":252}},"ins_contents":[{"Add":" if ($user) {"},{"Add":" # Automatically upgrade Persona accounts to Google accounts."},{"Add":" if ($user->type eq \"persona\" && $type eq \"google\") {"},{"Add":" $user->update({type => \"google\"});"},{"Add":" }"},{"Add":""},{"Add":" die \"You cannot login via login type '$type'.\\n\" if $user->type ne $type;"},{"Add":" } else {"}],"del_contents":[{"Del":" if (!$user) {\n"}]}},{"Edit":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":86,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":885}],"down_context":[{"change":8,"pos":885}],"flag":"BLOCK","start":953,"end":990,"inode":{"change":8,"pos":252}}},"contents":[{"Add":" , fullname => $fullName,"}]}},{"Replacement":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":89,"ins":{"up_context":[{"change":8,"pos":953}],"down_context":[{"change":8,"pos":953}],"flag":"BLOCK","start":991,"end":1019,"inode":{"change":8,"pos":252}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":953},"to":{"change":8,"start":0,"end":32},"introduced_by":8}],"inode":{"change":8,"pos":252}},"ins_contents":[{"Add":" , type => $type"}],"del_contents":[{"Del":" , type => \"persona\"\n"}]}},{"Edit":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":99,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1115}],"down_context":[{"change":8,"pos":1115}],"flag":"BLOCK","start":1020,"end":1214,"inode":{"change":8,"pos":252}}},"contents":[{"Add":""},{"Add":""},{"Add":"sub persona_login :Path('/persona-login') Args(0) {"},{"Add":" my ($self, $c) = @_;"},{"Add":" requirePost($c);"},{"Add":""},{"Add":" error($c, \"Logging in via Persona is not enabled.\") unless $c->config->{enable_persona};"}]}},{"Edit":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":107,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1116}],"down_context":[{"change":8,"pos":1116}],"flag":"BLOCK","start":1215,"end":1276,"inode":{"change":8,"pos":252}}},"contents":[{"Add":" my $assertion = $c->stash->{params}->{assertion} or die;"}]}},{"Edit":{"inode":{"change":8,"pos":252},"path":"src/lib/Hydra/Controller/User.pm","line":109,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1117}],"down_context":[{"change":8,"pos":1421}],"flag":"BLOCK","start":1277,"end":3590,"inode":{"change":8,"pos":252}}},"contents":[{"Add":" my $ua = new LWP::UserAgent;"},{"Add":" my $response = $ua->post("},{"Add":" 'https://verifier.login.persona.org/verify',"},{"Add":" { assertion => $assertion,"},{"Add":" audience => $c->uri_for('/')"},{"Add":" });"},{"Add":" error($c, \"Did not get a response from Persona.\") unless $response->is_success;"},{"Add":""},{"Add":" my $d = decode_json($response->decoded_content) or die;"},{"Add":" error($c, \"Persona says: $d->{reason}\") if $d->{status} ne \"okay\";"},{"Add":""},{"Add":" doEmailLogin($self, $c, \"persona\", $d->{email}, undef);"},{"Add":"}"},{"Add":""},{"Add":""},{"Add":"# From https://www.googleapis.com/oauth2/v3/certs. Should probably not"},{"Add":"# hard-code this."},{"Add":"my $googleKeys = <<'EOF';"},{"Add":"{"},{"Add":" \"keys\": ["},{"Add":" {"},{"Add":" \"kty\": \"RSA\","},{"Add":" \"alg\": \"RS256\","},{"Add":" \"use\": \"sig\","},{"Add":" \"kid\": \"10685afd5291883ce668345afd77201390406f82\","},{"Add":" \"n\": \"xeNopuszp35W6H1w2Tw4OrSwT8BZ9f7-2PoOyWZmfMmUDmYT2uxrZezDK0YLap5LVmpLNcpZP5Hj67_32NU3my4qfA-SlxuJMUxHWJF7Dqr-QNAqld0SZ_po4qz5ZTHDxNxoZ4iw_T-4lhIBGm0RIZprDDGPI7Vo8qIeIMjZywoh_nq32zB6tnjEUBvHcgay0qXEnQkKkavzHO_c5sLc1qXM0jDQVqyO1enevW2yA_8gP0Qb7014ycN5umCvEHc66c2_iNT-R4zgw8gd1g05n2xwyET8qb_3wi5LqUV-Cri4mJ2xwGY8uynlD2I4jVtOYJusBgNs6AfwyehzsLdwSQ\","},{"Add":" \"e\": \"AQAB\""},{"Add":" },"},{"Add":" {"},{"Add":" \"kty\": \"RSA\","},{"Add":" \"alg\": \"RS256\","},{"Add":" \"use\": \"sig\","},{"Add":" \"kid\": \"5a68fc8a3ec0c30e0be95aa08db99a68a725467f\","},{"Add":" \"n\": \"zmXvUwXYSo8VouhnkURp-3xywch-jPrk7q0gugqC7QIchBPnvdXdS-bj6sr1AqDl_hEDtiLGfiVr3Ft_U022rtHAl5n5NxyybUtZXWyT5yQZM4jopGBajavEUdCl9b4pqb-q_3fVaxUXe7re23sVjI5Bntd-8RYZ70tq-ZvCWBqsnz6lHi9Ditp3CZGWLMMBZlIv3nKnClOrZXL98Jmt7AAod-Gtk65saqnrMwWtBcI_Q-3u23ytywbMLanCeFFNUWlIOgZqyYYkOm-ylLRJzVaZ1THtcWILWCYUgxXjyF9DtXO3a8nct2JhdacD3LzRiPv3sXr31cg4arwUk19JoQ\","},{"Add":" \"e\": \"AQAB\""},{"Add":" }"},{"Add":" ]"},{"Add":"}"},{"Add":"EOF"},{"Add":""},{"Add":""},{"Add":"sub google_login :Path('/google-login') Args(0) {"},{"Add":" my ($self, $c) = @_;"},{"Add":" requirePost($c);"},{"Add":""},{"Add":" error($c, \"Logging in via Google is not enabled.\") unless $c->config->{enable_google_login};"},{"Add":""},{"Add":" my $data = decode_jwt("},{"Add":" token => ($c->stash->{params}->{id_token} // die \"No token.\"),"},{"Add":" kid_keys => $googleKeys,"},{"Add":" verify_exp => 1,"},{"Add":" );"},{"Add":""},{"Add":" die unless $data->{aud} eq $c->config->{google_client_id};"},{"Add":" die unless $data->{iss} eq \"accounts.google.com\" || $data->{iss} eq \"https://accounts.google.com\";"},{"Add":" die \"Email address is not verified\" unless $data->{email_verified};"},{"Add":" # FIXME: verify hosted domain claim?"},{"Add":""},{"Add":" doEmailLogin($self, $c, \"google\", $data->{email}, $data->{name} // undef);"},{"Add":"}"},{"Add":""},{"Add":""}]}},{"FileAdd":{"meta":{"basename":"auth.tt","metadata":0},"context":[{"change":37,"pos":1486}],"contents":[{"Add":"[% IF c.user_exists %]"},{"Add":""},{"Add":" "},{"Add":""},{"Add":"[% ELSE %]"},{"Add":""},{"Add":" "},{"Add":""},{"Add":" "},{"Add":""},{"Add":" [% IF c.config.enable_google_login %]"},{"Add":" "},{"Add":" [% END %]"},{"Add":""},{"Add":"[% END %]"},{"Add":""},{"Add":"[% IF c.config.enable_persona %]"},{"Add":" "},{"Add":""},{"Add":" "},{"Add":"[% END %]"}]}},{"Edit":{"inode":{"change":8,"pos":11219},"path":"src/root/layout.tt","line":38,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2270}],"down_context":[{"change":38,"pos":54}],"flag":"BLOCK","start":6525,"end":6757,"inode":{"change":8,"pos":11219}}},"contents":[{"Add":""},{"Add":" [% IF c.config.enable_google_login %]"},{"Add":" "},{"Add":" "},{"Add":" [% END %]"}]}},{"Replacement":{"inode":{"change":8,"pos":11219},"path":"src/root/layout.tt","line":102,"ins":{"up_context":[{"change":8,"pos":9312}],"down_context":[{"change":8,"pos":9375}],"flag":"BLOCK","start":6758,"end":6962,"inode":{"change":8,"pos":11219}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":9312},"to":{"change":8,"start":511,"end":641},"introduced_by":8}],"inode":{"change":8,"pos":11219}},"ins_contents":[{"Add":" You are signed in as [% HTML.escape(c.user.username) %]"},{"Add":" [%- IF c.user.type == 'persona' %] via Persona"},{"Add":" [%- ELSIF c.user.type == 'google' %] via Google[% END %]."}],"del_contents":[{"Del":" You are signed in as [% HTML.escape(c.user.username) %][% IF c.user.type == 'persona' %] via Persona[% END %].\n"}]}},{"Edit":{"inode":{"change":8,"pos":11219},"path":"src/root/layout.tt","line":110,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1323},"to":{"change":8,"start":1323,"end":1337},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1337},"to":{"change":8,"start":218,"end":246},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":246},"to":{"change":8,"start":166,"end":428},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":428},"to":{"change":8,"start":449,"end":471},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":449},"to":{"change":8,"start":449,"end":471},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":471},"to":{"change":8,"start":7485,"end":7486},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2168},"to":{"change":8,"start":7485,"end":7486},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":11729},"to":{"change":8,"start":7485,"end":7486},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7486},"to":{"change":8,"start":642,"end":695},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":695},"to":{"change":8,"start":525,"end":603},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":525},"to":{"change":8,"start":525,"end":603},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":603},"to":{"change":7,"start":0,"end":31},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":31},"to":{"change":8,"start":618,"end":685},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":618},"to":{"change":8,"start":618,"end":685},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":685},"to":{"change":8,"start":2257,"end":2258},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2257},"to":{"change":8,"start":2257,"end":2258},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2258},"to":{"change":8,"start":686,"end":868},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":868},"to":{"change":8,"start":35,"end":191},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":191},"to":{"change":8,"start":429,"end":561},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":561},"to":{"change":8,"start":259,"end":275},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":259},"to":{"change":8,"start":259,"end":275},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":275},"to":{"change":8,"start":1243,"end":1297},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1243},"to":{"change":8,"start":1243,"end":1297},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1297},"to":{"change":8,"start":2360,"end":2361},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2360},"to":{"change":8,"start":2360,"end":2361},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2361},"to":{"change":8,"start":1298,"end":1346},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1346},"to":{"change":8,"start":0,"end":55},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":55},"to":{"change":8,"start":1380,"end":1518},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1380},"to":{"change":8,"start":1380,"end":1518},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1518},"to":{"change":8,"start":422,"end":1400},"introduced_by":8}],"inode":{"change":8,"pos":11219}}},"contents":[{"Del":"\n \n"},{"Del":"\n"},{"Del":" [% IF c.user_exists && c.user.type == 'hydra' %]\n"},{"Del":" \n"},{"Del":" [% ELSIF personaEnabled %]\n"},{"Del":" \n"},{"Del":"\n"},{"Del":" \n [% END %]\n\n"},{"Del":" [% IF !c.user_exists %]\n \n"}]}},{"Replacement":{"inode":{"change":8,"pos":11219},"path":"src/root/layout.tt","line":111,"ins":{"up_context":[{"change":8,"pos":1401}],"down_context":[{"change":8,"pos":1804}],"flag":"BLOCK","start":6963,"end":6989,"inode":{"change":8,"pos":11219}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1401},"to":{"change":8,"start":1401,"end":1804},"introduced_by":8}],"inode":{"change":8,"pos":11219}},"ins_contents":[{"Add":" [% PROCESS auth.tt %]"}],"del_contents":[{"Del":" \n [% END %]\n"}]}},{"Replacement":{"inode":{"change":8,"pos":6671},"path":"src/root/topbar.tt","line":130,"ins":{"up_context":[{"change":8,"pos":2441}],"down_context":[{"change":8,"pos":2493}],"flag":"BLOCK","start":6990,"end":7042,"inode":{"change":8,"pos":6671}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2441},"to":{"change":8,"start":2441,"end":2493},"introduced_by":8}],"inode":{"change":8,"pos":6671}},"ins_contents":[{"Add":" Sign out"}],"del_contents":[{"Del":" Sign out\n"}]}},{"Replacement":{"inode":{"change":8,"pos":6671},"path":"src/root/topbar.tt","line":133,"ins":{"up_context":[{"change":8,"pos":311}],"down_context":[{"change":8,"pos":692}],"flag":"BLOCK","start":7043,"end":7346,"inode":{"change":8,"pos":6671}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":311},"to":{"change":8,"start":616,"end":692},"introduced_by":8}],"inode":{"change":8,"pos":6671}},"ins_contents":[{"Add":" [% WRAPPER makeSubMenu title=\"Sign in\" %]"},{"Add":" [% IF c.config.enable_google_login %]"},{"Add":"

"},{"Add":"

"},{"Add":" [% END %]"},{"Add":" [% IF c.config.enable_persona %]"}],"del_contents":[{"Del":" [% IF personaEnabled %]\n [% WRAPPER makeSubMenu title=\"Sign in\" %]\n"}]}},{"Edit":{"inode":{"change":8,"pos":6671},"path":"src/root/topbar.tt","line":147,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":930},"to":{"change":8,"start":930,"end":1044},"introduced_by":8}],"inode":{"change":8,"pos":6671}}},"contents":[{"Del":"

\n Sign in with a Hydra account\n

\n"}]}},{"Edit":{"inode":{"change":8,"pos":6671},"path":"src/root/topbar.tt","line":148,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1060},"to":{"change":8,"start":1060,"end":1075},"introduced_by":8}],"inode":{"change":8,"pos":6671}}},"contents":[{"Del":" [% ELSE %]\n"}]}},{"Replacement":{"inode":{"change":8,"pos":6671},"path":"src/root/topbar.tt","line":149,"ins":{"up_context":[{"change":8,"pos":339}],"down_context":[{"change":8,"pos":418}],"flag":"BLOCK","start":7347,"end":7432,"inode":{"change":8,"pos":6671}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":339},"to":{"change":8,"start":1076,"end":1140},"introduced_by":8}],"inode":{"change":8,"pos":6671}},"ins_contents":[{"Add":" Sign in with a Hydra account"}],"del_contents":[{"Del":" Sign in\n"}]}},{"Replacement":{"inode":{"change":39,"pos":4561},"path":"src/root/user.tt","line":56,"ins":{"up_context":[{"change":8,"pos":5979}],"down_context":[{"change":8,"pos":6099}],"flag":"BLOCK","start":7433,"end":7621,"inode":{"change":39,"pos":4561}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":5979},"to":{"change":8,"start":1750,"end":1935},"introduced_by":8}],"inode":{"change":39,"pos":4561}},"ins_contents":[{"Add":" user.emailaddress) %]/>"}],"del_contents":[{"Del":" user.emailaddress) %]/>\n"}]}}],"owner":"grahamc","repo":"hydra2","token":"vHLdjNKgJMB/NB1wbroWA2E+n+EeltBgF/1P/cqOu6U=","login":null}

…

Dependencies

Change contents