From 55f66f01da96d83dfd077fda2bb2115df3ee5ee3 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 22 Jun 2009 19:05:51 +0000 Subject: [PATCH] Use AuthException. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5833 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/server/Rejector.java | 6 ++---- .../threerings/presents/server/ServiceAuthenticator.java | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/java/com/threerings/presents/server/Rejector.java b/src/java/com/threerings/presents/server/Rejector.java index 30317b623..0f4050c92 100644 --- a/src/java/com/threerings/presents/server/Rejector.java +++ b/src/java/com/threerings/presents/server/Rejector.java @@ -24,9 +24,7 @@ package com.threerings.presents.server; import com.google.inject.Guice; import com.google.inject.Injector; -import com.samskivert.io.PersistenceException; import com.samskivert.util.StringUtil; - import com.threerings.util.MessageBundle; import com.threerings.presents.net.AuthResponse; @@ -87,10 +85,10 @@ public class Rejector extends PresentsServer { @Override protected void processAuthentication (AuthingConnection conn, AuthResponse rsp) - throws PersistenceException + throws Exception { log.info("Rejecting request: " + conn.getAuthRequest()); - rsp.getData().code = _errmsg; + throw new AuthException(_errmsg); } } diff --git a/src/java/com/threerings/presents/server/ServiceAuthenticator.java b/src/java/com/threerings/presents/server/ServiceAuthenticator.java index 2db28389e..3d176fa1e 100644 --- a/src/java/com/threerings/presents/server/ServiceAuthenticator.java +++ b/src/java/com/threerings/presents/server/ServiceAuthenticator.java @@ -23,8 +23,6 @@ package com.threerings.presents.server; import java.lang.reflect.Constructor; -import com.samskivert.io.PersistenceException; - import com.threerings.util.Name; import com.threerings.presents.data.AuthCodes; @@ -64,13 +62,12 @@ public abstract class ServiceAuthenticator extends Chain @Override // from abstract Authenticator protected void processAuthentication (AuthingConnection conn, AuthResponse rsp) - throws PersistenceException + throws Exception { T creds = _credsClass.cast(conn.getAuthRequest().getCredentials()); if (!areValid(creds)) { log.warning("Received invalid service auth request?", "creds", creds); - rsp.getData().code = AuthCodes.SERVER_ERROR; - return; + throw new AuthException(AuthCodes.SERVER_ERROR); } try { @@ -78,7 +75,7 @@ public abstract class ServiceAuthenticator extends Chain rsp.getData().code = AuthResponseData.SUCCESS; } catch (Exception e) { log.warning("Failed to construct auth name", "namer", _authNamer, e); - rsp.getData().code = AuthCodes.SERVER_ERROR; + throw new AuthException(AuthCodes.SERVER_ERROR); } }