changed from private to protected such that sub-classes can reuse met…

…hods and variables
wyona · May 20, 2014 · 100f28a · 100f28a
1 parent 8fc3c8e
commit 100f28a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/CASWebAuthenticatorImpl.java b/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/CASWebAuthenticatorImpl.java
@@ -59,7 +59,7 @@ public class CASWebAuthenticatorImpl implements WebAuthenticator {
 
     private static Logger log = LogManager.getLogger(CASWebAuthenticatorImpl.class);
 
-    private String loginURL;
+    protected String loginURL;
     private boolean redirectToLoginURL = true;
     private String validateURL;
     private String pgtURL;
@@ -247,7 +247,7 @@ public HttpServletResponse doAuthenticate(HttpServletRequest request, HttpServle
      * @param realm TODO
      * @return language, e.g. 'de' or 'fr'
      */
-    private String getLanguage(HttpServletRequest request, Realm realm) {
+    protected String getLanguage(HttpServletRequest request, Realm realm) {
         String pathRelativeToRealm = request.getServletPath().replaceFirst(realm.getMountPoint(),"/"); // INFO: For example "/en/index.html"
         String contentLanguage = org.wyona.yanel.servlet.security.impl.DefaultWebAuthenticatorImpl.getContentLanguage(pathRelativeToRealm);
         if (contentLanguage != null) {
@@ -359,7 +359,7 @@ private Document validate(String ticket, HttpServletRequest request, Realm realm
      * @name name Parameter value
      * @return url with appended query string parameter
      */
-    private String addToQueryString(String url, String name, String value) {
+    protected String addToQueryString(String url, String name, String value) {
         if (url.indexOf("?") > 0) {
             return url + "&" + name + "=" + value;
         } else {
@@ -372,7 +372,7 @@ private String addToQueryString(String url, String name, String value) {
      * @param request Request containing ticket (and/or service) as query string parameters
      * @return URL without ticket (and/or service) as query string parameters
      */
-    private String getRequestURLWithoutTicket(HttpServletRequest request) {
+    protected String getRequestURLWithoutTicket(HttpServletRequest request) {
         String url = request.getRequestURL().toString();
         String qs = request.getQueryString();
         if (qs != null) {
@@ -445,7 +445,7 @@ public boolean doLogout(HttpServletRequest request, HttpServletResponse response
      * Modify URL depending whether reverse proxy is configured
      * @param url URL which will be modified
      */
-    private String considerProxy(String url, Realm realm) {
+    protected String considerProxy(String url, Realm realm) {
         if (realm != null && realm.isProxySet()) { // INFO: Also see YanelServlet#getRequestURLQS(...)
             log.warn("DEBUG: Modify url '" + url + "' according to reverse proxy configuration...");
             try {
@@ -628,7 +628,7 @@ public static final String getProxyIdFilename(String proxyGrantingTicket) {
      * Encode URL, such that it can be used as part of the query string
      * @param url URL to be encoded
      */
-    private String encode(String url) {
+    protected String encode(String url) {
 /* INFO: Because of "java.security.cert.CertificateException: No subject alternative names present", we replace as workaround the IP 127.0.0.1 by localhost
         if (url.indexOf("127.0.0.1") >= 0) {
             log.warn("Replace IP by name: " + url);