Changeset 36396

Timestamp:

01/10/10 15:17:13 (3 years ago)

Author:

int128

Message:

複数のListenerに対応

Location:

lang/java/misc/oauth-filter/src/org/hidetake/util/oauth

Files:

• OAuthValidationFilter.java (modified) (6 diffs)
• ValidationEventListener.java (modified) (2 diffs)

lang/java/misc/oauth-filter/src/org/hidetake/util/oauth/OAuthValidationFilter.java

@@ -28 +28 @@
  * 
  * <ul>
- * <li>net.oauth.OAuthAccessor: Required.</li>
- * <li>org.hidetake.util.oauth.ValidationEventListener: Optional.</li>
+ * <li>net.oauth.OAuthAccessor: Required, specify an accessor class.</li>
+ * <li>org.hidetake.util.oauth.ValidationEventListener: Optional, specify event listeners, comma separated.</li>
  * </ul>
  * 
@@ -53 +53 @@
         private final OAuthValidator validator = new SimpleOAuthValidator();
         private OAuthAccessor accessor;
-        private ValidationEventListener eventListener;
+        private List<ValidationEventListener> eventListeners;
 
         @Override
@@ -70 +70 @@
                         }
 
-                        // load event listener
-                        String eventHandlerName = config.getInitParameter("org.hidetake.util.oauth.ValidationEventListener");
-                        if(eventHandlerName == null) {
-                                eventListener = null;
+                        // load event listeners
+                        String eventListenerNames = config.getInitParameter("org.hidetake.util.oauth.ValidationEventListener");
+                        if(eventListenerNames == null) {
                         }
                         else {
-                                eventListener = (ValidationEventListener) Class.forName(eventHandlerName).newInstance();
+                                for(String eventListenerName : eventListenerNames.split(",")) {
+                                        ValidationEventListener eventListener =
+                                                (ValidationEventListener) Class.forName(eventListenerName).newInstance();
+                                        eventListeners.add(eventListener);
+                                }
                         }
                 }
@@ -100 +103 @@
                         // construct a message object
                         StringBuilder url = parseRequestUrl(hreq);
-                        if(eventListener == null) {
-                        }
-                        else {
+                        for(ValidationEventListener eventListener : eventListeners) {
                                 eventListener.manipulateURL(url, hreq);
                         }
@@ -110 +111 @@
                         // validate signature
                         validator.validateMessage(message, accessor);
-                        if(eventListener == null) {
-                        }
-                        else {
+                        for(ValidationEventListener eventListener : eventListeners) {
                                 eventListener.onValidationComplete(hres);
                         }
@@ -118 +117 @@
                 }
                 catch (OAuthException e) {
-                        if(eventListener == null) {
+                        boolean sent = false;
+                        for(ValidationEventListener eventListener : eventListeners) {
+                                sent |= eventListener.onOAuthException(hreq, hres, e);
+                        }
+                        if(!sent) {
+                                // default behavior
                                 hres.sendError(HttpServletResponse.SC_FORBIDDEN);
                         }
-                        else {
-                                eventListener.onOAuthException(hres);
-                        }
                 }
                 catch (URISyntaxException e) {
-                        if(eventListener == null) {
+                        boolean sent = false;
+                        for(ValidationEventListener eventListener : eventListeners) {
+                                sent |= eventListener.onURISyntaxException(hreq, hres, e);
+                        }
+                        if(!sent) {
+                                // default behavior
                                 hres.sendError(HttpServletResponse.SC_FORBIDDEN);
-                        }
-                        else {
-                                eventListener.onURISyntaxException(hres);
                         }
                 }

lang/java/misc/oauth-filter/src/org/hidetake/util/oauth/ValidationEventListener.java

@@ -23 +23 @@
          * <p>Default implementation: sends 403 response to web browser.</p>
          * 
+         * @return true if response has been sent, false otherwise 
+         * @param request servlet request object
          * @param response servlet response object
+         * @param e exception
          */
-        public void onOAuthException(HttpServletResponse response);
+        public boolean onOAuthException(HttpServletRequest request, HttpServletResponse response, OAuthException e);
 
         /**
@@ -32 +35 @@
          * <p>Default implementation: sends 403 response to web browser.</p>
          * 
+         * @return true if response has been sent, false otherwise 
+         * @param request servlet request object
          * @param response servlet response object
+         * @param e exception
          */
-        public void onURISyntaxException(HttpServletResponse response);
+        public boolean onURISyntaxException(HttpServletRequest request, HttpServletResponse response, URISyntaxException e);
 
         /**