I was wrong... Just lets you attach your account to the homewiki global account, but the global account still gets the homewiki's password. So the attacker still doesn't have access to the global account.

Combined with bug 70469, this lets the owner of the homewiki take over an account they don't own, but that's less serious.

Created attachment 16495
Check home wiki password before merge

Just like we do in the dry run, check the home wiki's password before doing the actual merge.

Attached:

Created attachment 16497
Check home wiki password before merge - 1.24 wmf22

Rebased on top of gerrit 158578.

After this is public, I'll make all those bool flags an options array.

Attached:

+2, patch looks good. Only thing is we reverted the commit out of 1.24wmf22, so attachment 16495 should go with 1.24wmf22, and attachment 16497 should go with 1.25wmf1 and master.

From SAL: 19:15 AaronS: Deployed security patches to CentralAuth

I put up https://gerrit.wikimedia.org/r/#/c/163225/ as a draft. Apparently there is some wiki farm that uses CA too...so they will have to be notified first before that is merged.

Created attachment 16725
Check home wiki password before merge - 1.24wmf3 (after file reorg)

Attached: