zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-21 03:39:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor authInfo validation

Browse source 
1) Don't do ofy().load() inside a model class (in DomainAuthInfo)
2) Move the one use of verify into the one caller in ResourceFlowUtils
3) Hosts don't support authInfo, so remove useless code

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137984809
This commit is contained in:
cgoldfeder 2016-11-02 13:24:26 -07:00 • committed by Ben McIlwain
parent f95f27ed72
commit 2dd703ef3a
28 changed files with 102 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

19
java/google/registry/model/contact/ContactAuthInfo.java
View file

@ -14,10 +14,7 @@
package google.registry.model.contact;
import static com.google.common.base.Preconditions.checkNotNull;
import com.googlecode.objectify.annotation.Embed;
import google.registry.model.EppResource;
import google.registry.model.eppcommon.AuthInfo;
import javax.xml.bind.annotation.XmlType;
@ -25,25 +22,9 @@ import javax.xml.bind.annotation.XmlType;
@Embed
@XmlType(namespace = "urn:ietf:params:xml:ns:contact-1.0")
public class ContactAuthInfo extends AuthInfo {
public static ContactAuthInfo create(PasswordAuth pw) {
ContactAuthInfo instance = new ContactAuthInfo();
instance.pw = pw;
return instance;
}
@Override
public void verifyAuthorizedFor(EppResource eppResource) throws BadAuthInfoException {
ContactResource contact = (ContactResource) eppResource;
PasswordAuth passwordAuth = checkNotNull(getPw());
// It's rather strange to specify a repoId on a contact auth info. Instead of explicitly
// rejecting it, we'll just make sure the repoId matches this particular contact.
if (passwordAuth.getRepoId() != null && !contact.getRepoId().equals(getRepoId())) {
throw new BadAuthInfoException();
}
if (!contact.getAuthInfo().getPw().getValue().equals(passwordAuth.getValue())) {
throw new BadAuthInfoException();
}
}
}