Projects >> OWASP-CSRFGuard >>dbc36821fc2a62702096da8a8e57546d86c78330

Chunk
Conflicting content 
	public final static String PAGE_TOKENS_KEY = "Owasp_CsrfGuard_Pages_Tokens_Key";

	private final static String ACTION_PREFIX = "org.owasp.csrfguard.action.";
<<<<<<< HEAD
	
	private final static String PROTECTED_PAGE_PREFIX = "org.owasp.csrfguard.protected.";
	
=======

>>>>>>> f250cfdc603e33aad09495009c06cd6d8c22de35
	private final static String UNPROTECTED_PAGE_PREFIX = "org.owasp.csrfguard.unprotected.";

	private ILogger logger = null;
Solution content 
	public final static String PAGE_TOKENS_KEY = "Owasp_CsrfGuard_Pages_Tokens_Key";

	private final static String ACTION_PREFIX = "org.owasp.csrfguard.action.";

	private final static String PROTECTED_PAGE_PREFIX = "org.owasp.csrfguard.protected.";
	
	private final static String UNPROTECTED_PAGE_PREFIX = "org.owasp.csrfguard.unprotected.";

	private ILogger logger = null;
File
CsrfGuard.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
	private boolean useNewTokenLandingPage = false;

	private boolean ajax = false;
<<<<<<< HEAD
	
	private boolean protect = false;
	
	private String sessionKey = null;
	
	private Set protectedPages = null;
	
=======

	private String sessionKey = null;

>>>>>>> f250cfdc603e33aad09495009c06cd6d8c22de35
	private Set unprotectedPages = null;

	private Set protectedMethods = null;
Solution content 
	private boolean useNewTokenLandingPage = false;

	private boolean ajax = false;
	
	private boolean protect = false;
	
	private String sessionKey = null;
	
	private Set protectedPages = null;

	private Set unprotectedPages = null;

	private Set protectedMethods = null;
File
CsrfGuard.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
				csrfGuard.getProtectedMethods().add(method.trim());
			}
		}
<<<<<<< HEAD

		return csrfGuard;
	}

	public CsrfGuard() {
		actions = new ArrayList();
		protectedPages = new HashSet();
		unprotectedPages = new HashSet();
		protectedMethods = new HashSet();
=======
>>>>>>> f250cfdc603e33aad09495009c06cd6d8c22de35
	}

	public ILogger getLogger() {
Solution content 
				csrfGuard.getProtectedMethods().add(method.trim());
			}
		}
	}

	public CsrfGuard() {
		actions = new ArrayList();
		protectedPages = new HashSet();
		unprotectedPages = new HashSet();
		protectedMethods = new HashSet();
	}

	public ILogger getLogger() {
File
CsrfGuard.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
	/**
		return retval;
	}

<<<<<<< HEAD
  public boolean isUnprotectedPageOrMethod(HttpServletRequest request) {
    return (!isProtectedPage(request.getRequestURI()) || isUnprotectedMethod(request.getMethod()));
  }
=======
	public boolean isUnprotectedPageOrMethod(HttpServletRequest request) {
	  return (isUnprotectedPage(request.getRequestURI()) || isUnprotectedMethod(request.getMethod()));
	}
>>>>>>> f250cfdc603e33aad09495009c06cd6d8c22de35
	 * FIXME: taken from Tomcat - ApplicationFilterFactory
Solution content 
	/**
		return retval;
	}
	
	public boolean isUnprotectedPageOrMethod(HttpServletRequest request) {
		return (!isProtectedPage(request.getRequestURI()) || isUnprotectedMethod(request.getMethod()));
	}
	
	 * FIXME: taken from Tomcat - ApplicationFilterFactory
File
CsrfGuard.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
		return retval;
	}

<<<<<<< HEAD
	private boolean isUriExactMatch(String testPath, String requestPath) {
		boolean retval = false;

		/** Case 1: Exact Match **/
		if (testPath.equals(requestPath)) {
			retval = true;
		}

		return retval;
	}

}
=======
}
>>>>>>> f250cfdc603e33aad09495009c06cd6d8c22de35
Solution content 
		return retval;
	}

	private boolean isUriExactMatch(String testPath, String requestPath) {
		boolean retval = false;

		/** Case 1: Exact Match **/
		if (testPath.equals(requestPath)) {
			retval = true;
		}

		return retval;
	}

}
File
CsrfGuard.java
Developer's decision
Version 1
Kind of conflict
Method declaration