[Ogoglio-commits] SF.net SVN: ogoglio: [637] maven/trunk/ogoglio-appdev/src/main/java/com/ ogoglio/appdev/servlet/RemoteSiteResource.java

[<tre...@us...>]

Revision: 637
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=637&view=rev
Author:   trevorolio
Date:     2007-12-20 21:21:52 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
Fixed a bug in the new RemoteSiteResource in which the auth doc was not required despite it being requested.

Modified Paths:
--------------
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/RemoteSiteResource.java

Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/RemoteSiteResource.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/RemoteSiteResource.java	2007-12-18 01:44:26 UTC (rev 636)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/RemoteSiteResource.java	2007-12-21 05:21:52 UTC (rev 637)
@@ -48,7 +48,7 @@
 
     public void doGet(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
         AuthDocument authDoc = requestAllowed(request, pathElements);
-        if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+        if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
             response.setStatus(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
@@ -57,7 +57,7 @@
 
     public void doPost(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
         AuthDocument authDoc = requestAllowed(request, pathElements);
-        if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+        if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
             response.setStatus(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
@@ -66,7 +66,7 @@
 
     public void doPut(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
         AuthDocument authDoc = requestAllowed(request, pathElements);
-        if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+        if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
             response.setStatus(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
@@ -75,7 +75,7 @@
 
     public void doDelete(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
         AuthDocument authDoc = requestAllowed(request, pathElements);
-        if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+        if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
             response.setStatus(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
@@ -84,7 +84,7 @@
 
     public void doHead(HttpServletRequest request, HttpServletResponse response, String[] pathElements) throws ServletException, IOException {
         AuthDocument authDoc = requestAllowed(request, pathElements);
-        if ((requiredUsernamePathIndex == -1 || requiresAdmin) && authDoc == null) {
+        if ((requiredUsernamePathIndex == -1 || requiresAdmin || requiresAuth) && (authDoc == null || !authDoc.isAuthenticated())) {
             response.setStatus(HttpServletResponse.SC_FORBIDDEN);
             return;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.