[jboss-svn-commits] JBL Code SVN: r7261 - in labs/jbosslabs/trunk/portal-extensions: configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF forge-login/src/java/org/jboss/labs/login forge-portal-attr/src/java/org/jboss/forge/portal forge-tagme jbosswiki jbosswiki/forge-wiki/src/web/WEB-INF jbosswiki/wiki-common jbosswiki/wiki-common/src/java/org/jboss/wiki
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 31 19:24:07 EST 2006
Author: szimano
Date: 2006-10-31 19:23:55 -0500 (Tue, 31 Oct 2006)
New Revision: 7261
Added:
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
Modified:
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PerformLoginFilter.java
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java
Log:
login finished ! JBLAB-724
wiki modificatin
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-11-01 00:23:55 UTC (rev 7261)
@@ -18,6 +18,16 @@
<servlet-name>loginServlet</servlet-name>
<url-pattern>/loginAction</url-pattern>
</servlet-mapping>
+
+ <servlet>
+ <servlet-name>wrongLoginServlet</servlet-name>
+ <servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>wrongLoginServlet</servlet-name>
+ <url-pattern>/loginFailed</url-pattern>
+ </servlet-mapping>
<servlet>
<servlet-name>ShowLoginPage</servlet-name>
@@ -259,7 +269,8 @@
<realm-name>JBoss Portal</realm-name>
<form-login-config>
<form-login-page>/showLogin</form-login-page>
- <form-error-page>/portal/auth/portal/default/login/LoginWindow?action=1&action=loginFailed</form-error-page>
+ <!-- <form-error-page>/portal/auth/portal/default/login/LoginWindow?action=1&loginFailed=loginFailed</form-error-page>-->
+ <form-error-page>/portal/loginFailed</form-error-page>
</form-login-config>
</login-config>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java 2006-11-01 00:23:55 UTC (rev 7261)
@@ -123,11 +123,14 @@
log.info("Perforiming autologin");
String password = inputPassword.substring(PASS_TOKEN.length());
+
+ log.info("Whole: " + password);
+
String[] tokens = password.split(TOKENIZER);
- String ip = tokens[1];
- String browser = tokens[2];
- String key = ip + browser + getUsername();
- String pass = tokens[3];
+ String key = tokens[1];
+ String pass = tokens[2];
+ //String key = ip + browser + getUsername();
+ //String pass = tokens[3];
pass = ForgeHelper.encodeToMD5(pass);
@@ -137,7 +140,7 @@
String persistedPass = (String)service.getProperty(key, AUTLOGIN_PASSWORD);
- log.info("Ip: " + ip + "Browser: " + browser + "Key: " + key + "Pass: " + pass + "PersPass: " + persistedPass);
+ log.info("Ip: " + "Key: " + key + "Pass: " + pass + "PersPass: " + persistedPass);
return pass.equals(persistedPass);
} else {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java 2006-11-01 00:23:55 UTC (rev 7261)
@@ -32,12 +32,18 @@
private static final String USER_COOKIE = "labs_auto_username";
+ private static final String ID_COOKIE = "labs_auto_id";
+
private static final int COOKIE_EXPIRE = 60 * 60 * 24 * 30; // 30 days
private static final String AUTLOGIN_PASSWORD = "Autologin:password";
+ public static final int COOKIE_DESC_LEN = 3;
+
private static final String SESSION_REFRESHED = "SessionRefreshed";
+ public static final String ENTER_URI = "enterURI";
+
public void destroy() {
// TODO Auto-generated method stub
@@ -49,60 +55,79 @@
HttpServletRequest httpReq = (HttpServletRequest) request;
HttpServletResponse httpResp = (HttpServletResponse) response;
- log.info("Request: " + httpReq.getRequestURI() + " Query: "
- + httpReq.getQueryString());
+ // if loginFailed - do not try to autologin
+ if (!httpReq.getRequestURI().endsWith("/loginFailed")) {
+
+ log.info("Request: " + httpReq.getRequestURI() + " Query: "
+ + httpReq.getQueryString());
- log.info("doing login");
- if (httpReq.getUserPrincipal() != null
- && httpReq.getSession().getAttribute(REQUEST_AUTOLOGIN) != null
- && httpReq.getSession().getAttribute(REQUEST_AUTOLOGIN).equals(
- true)) {
+ log.info("doing login");
+ if (httpReq.getUserPrincipal() != null
+ && httpReq.getSession().getAttribute(REQUEST_AUTOLOGIN) != null
+ && httpReq.getSession().getAttribute(REQUEST_AUTOLOGIN)
+ .equals(true)) {
- log.info("sending cookies");
+ log.info("sending cookies");
- httpReq.getSession().removeAttribute(REQUEST_AUTOLOGIN);
+ httpReq.getSession().removeAttribute(REQUEST_AUTOLOGIN);
- String pass = generatePass();
+ String pass = generatePass(PASS_LEN);
- Cookie passCookie = new Cookie(PASS_COOKIE, pass);
- passCookie.setMaxAge(COOKIE_EXPIRE);
- passCookie.setPath("/");
- Cookie userCookie = new Cookie(USER_COOKIE, httpReq
- .getUserPrincipal().getName());
- userCookie.setMaxAge(COOKIE_EXPIRE);
- userCookie.setPath("/");
+ Cookie passCookie = new Cookie(PASS_COOKIE, pass);
+ passCookie.setMaxAge(COOKIE_EXPIRE);
+ passCookie.setPath("/");
+ Cookie userCookie = new Cookie(USER_COOKIE, httpReq
+ .getUserPrincipal().getName());
+ userCookie.setMaxAge(COOKIE_EXPIRE);
+ userCookie.setPath("/");
- httpResp.addCookie(passCookie);
- httpResp.addCookie(userCookie);
+ httpResp.addCookie(passCookie);
+ httpResp.addCookie(userCookie);
- saveUserContext(httpReq.getUserPrincipal().getName(), pass, httpReq
- .getRemoteAddr(), httpReq.getHeader("User-Agent"));
+ String id = saveUserContext(httpReq.getUserPrincipal()
+ .getName(), pass);
- log.info(httpReq.getUserPrincipal().getName());
- } else if (httpReq.getUserPrincipal() != null) {
- String[] cred = hasCookies(httpReq);
+ Cookie idCookie = new Cookie(ID_COOKIE, id);
+ idCookie.setMaxAge(COOKIE_EXPIRE);
+ idCookie.setPath("/");
- if (cred != null && cred.length == 2 && httpReq.getSession().getAttribute(SESSION_REFRESHED) == null) {
- refreshCookies(httpReq, httpResp);
- httpReq.getSession().setAttribute(SESSION_REFRESHED, true);
- }
- } else if (httpReq.getUserPrincipal() == null
- && !httpReq.getRequestURI().equals("/portal/default/login")) {
- // user not logged in - try autologin
+ httpResp.addCookie(idCookie);
- log.info("Looking for cookies: " + httpReq.getRequestURI());
+ log.info(httpReq.getUserPrincipal().getName());
+ } else if (httpReq.getUserPrincipal() != null) {
+ String[] cred = hasCookies(httpReq);
- String[] cred;
+ if (cred != null
+ && cred.length == COOKIE_DESC_LEN
+ && httpReq.getSession().getAttribute(SESSION_REFRESHED) == null) {
- if ((cred = hasCookies(httpReq)) != null && cred.length == 2) {
- String url = httpReq.getContextPath() + (httpReq.isSecure() ? "/authsec" : "/auth")
- + httpReq.getServletPath() + httpReq.getPathInfo();
- url = httpResp.encodeRedirectURL(url);
- httpResp.sendRedirect(url);
- return;
+ refreshCookies(httpReq, httpResp);
+ httpReq.getSession().setAttribute(SESSION_REFRESHED, true);
+ }
+ } else if (httpReq.getUserPrincipal() == null
+ && !httpReq.getRequestURI().equals("/portal/default/login")) {
+ // user not logged in - try autologin
+
+ log.info("Looking for cookies: " + httpReq.getRequestURI());
+
+ String[] cred;
+
+ if ((cred = hasCookies(httpReq)) != null
+ && cred.length == COOKIE_DESC_LEN) {
+
+ httpReq.getSession().setAttribute(ENTER_URI,
+ httpReq.getRequestURI() + httpReq.getQueryString());
+
+ String url = httpReq.getContextPath()
+ + (httpReq.isSecure() ? "/authsec" : "/auth")
+ + httpReq.getServletPath() + httpReq.getPathInfo();
+ url = httpResp.encodeRedirectURL(url);
+ httpResp.sendRedirect(url);
+ return;
+ }
}
}
-
+
chain.doFilter(request, response);
}
@@ -111,56 +136,76 @@
HttpServletResponse response) {
Cookie[] cookies = request.getCookies();
- if (cookies != null)
+ if (cookies != null) {
+ Cookie userCookie = null;
+ Cookie idCookie = null;
+ Cookie passCookie = null;
+
for (int i = 0; i < cookies.length; i++) {
- if (cookies[i].getName().equals(USER_COOKIE)
- || cookies[i].getName().equals(PASS_COOKIE)) {
+ if (cookies[i].getName().equals(USER_COOKIE)) {
+ userCookie = cookies[i];
+ userCookie.setMaxAge(COOKIE_EXPIRE);
+ userCookie.setPath("/");
- cookies[i].setMaxAge(COOKIE_EXPIRE);
- cookies[i].setPath("/");
- if (cookies[i].getName().equals(PASS_COOKIE)) {
- // generate new pass ans persist it in db
+ } else if (cookies[i].getName().equals(PASS_COOKIE)) {
+ passCookie = cookies[i];
+ passCookie.setMaxAge(COOKIE_EXPIRE);
+ passCookie.setPath("/");
- try {
- PropertyService propertyService = LabsServices
- .getPropertyService();
+ } else if (cookies[i].getName().equals(ID_COOKIE)) {
+ idCookie = cookies[i];
+ idCookie.setMaxAge(COOKIE_EXPIRE);
+ idCookie.setPath("/");
- String newPass = generatePass();
- cookies[i].setValue(newPass);
+ }
- String id = request.getRemoteAddr()
- + request.getHeader("User-Agent")
- + request.getUserPrincipal().getName();
+ }
- propertyService.setProperty(id, AUTLOGIN_PASSWORD,
- ForgeHelper.encodeToMD5(newPass));
+ if (passCookie != null && idCookie != null && userCookie != null) {
+ // generate new pass ans persist it in db
- log.info("cookie refreshed: " + newPass + " "
- + ForgeHelper.encodeToMD5(newPass));
+ try {
+ PropertyService propertyService = LabsServices
+ .getPropertyService();
- } catch (NamingException e) {
- log.error(e);
- }
- }
+ String newPass = generatePass(PASS_LEN);
+ passCookie.setValue(newPass);
- response.addCookie(cookies[i]);
+ propertyService
+ .setProperty(idCookie.getValue(),
+ AUTLOGIN_PASSWORD, ForgeHelper
+ .encodeToMD5(newPass));
+
+ log.info("cookie refreshed: " + newPass + " "
+ + ForgeHelper.encodeToMD5(newPass));
+
+ } catch (NamingException e) {
+ log.error(e);
}
+
+ response.addCookie(userCookie);
+ response.addCookie(idCookie);
+ response.addCookie(passCookie);
}
+
+ }
+
}
public static String[] hasCookies(HttpServletRequest httpReq) {
Cookie[] cookies = httpReq.getCookies();
- String[] cred = new String[2];
+ String[] cred = new String[COOKIE_DESC_LEN];
boolean hasUserCookie = false;
boolean hasPassCookie = false;
+ boolean hasIdCookie = false;
log.info("iterating thru cookies");
if (cookies != null)
for (int i = 0; i < cookies.length
- && !(hasUserCookie && hasPassCookie); i++) {
+ && !(hasUserCookie && hasPassCookie && hasIdCookie); i++) {
log.info(i + " cookie: " + cookies[i].getName());
@@ -170,10 +215,13 @@
} else if (cookies[i].getName().equals(PASS_COOKIE)) {
hasPassCookie = true;
cred[1] = cookies[i].getValue();
+ } else if (cookies[i].getName().equals(ID_COOKIE)) {
+ hasIdCookie = true;
+ cred[2] = cookies[i].getValue();
}
}
- if (hasUserCookie && hasPassCookie) {
+ if (hasUserCookie && hasPassCookie && hasIdCookie) {
return cred;
} else {
return null;
@@ -185,64 +233,79 @@
}
- private String generatePass() {
+ private String generatePass(int length) {
String pass = "";
Random random = new Random();
- for (int i = 0; i < PASS_LEN; i++) {
+ for (int i = 0; i < length; i++) {
pass += (char) (65 + random.nextInt(122 - 65));
}
return pass;
}
- private void saveUserContext(String username, String password, String ip,
- String browser) {
+ private String saveUserContext(String username, String password) {
try {
PropertyService propertyService = LabsServices.getPropertyService();
- String id = ip + browser + username;
+ String id = generateId(propertyService, username);
propertyService.setProperty(id, AUTLOGIN_PASSWORD, ForgeHelper
.encodeToMD5(password));
- log.info("Saved: " + username + " " + password + " " + ip + " "
- + browser);
+ log.info("Saved: " + username + " " + password + " " + id);
+ return id;
} catch (NamingException e) {
log.error(e);
+
+ return null;
}
}
+ private String generateId(PropertyService propertyService, String username) {
+ String pass = generatePass(5);
+
+ while (propertyService.getProperty(username + pass, AUTLOGIN_PASSWORD) != null) {
+ pass = generatePass(5);
+ }
+
+ return username + pass;
+ }
+
public static void clearCookies(HttpServletRequest request,
HttpServletResponse response) {
Cookie[] cookies = request.getCookies();
+ String id = null;
+
if (cookies != null)
for (int i = 0; i < cookies.length; i++) {
log.info("Cookie: " + cookies[i].getName());
if (cookies[i].getName().equals(USER_COOKIE)
- || cookies[i].getName().equals(PASS_COOKIE)) {
+ || cookies[i].getName().equals(PASS_COOKIE)
+ || cookies[i].getName().equals(ID_COOKIE)) {
log.info("deleting cookie: " + cookies[i].getName());
cookies[i].setMaxAge(0);
cookies[i].setPath("/");
response.addCookie(cookies[i]);
+
+ if (cookies[i].getName().equals(ID_COOKIE)) {
+ id = cookies[i].getValue();
+ }
}
}
- if (request.getUserPrincipal() != null) {
- String key = request.getRemoteAddr()
- + request.getHeader("User-Agent")
- + request.getUserPrincipal().getName();
+ if (request.getUserPrincipal() != null && id != null) {
PropertyService propertyService;
try {
propertyService = LabsServices.getPropertyService();
- if (propertyService.getProperty(key, AUTLOGIN_PASSWORD) != null) {
- propertyService.removeProperty(key, AUTLOGIN_PASSWORD);
+ if (propertyService.getProperty(id, AUTLOGIN_PASSWORD) != null) {
+ propertyService.removeProperty(id, AUTLOGIN_PASSWORD);
}
} catch (NamingException e) {
log.error(e);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PerformLoginFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PerformLoginFilter.java 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PerformLoginFilter.java 2006-11-01 00:23:55 UTC (rev 7261)
@@ -42,11 +42,10 @@
String[] cred;
if (httpReq.getRequestURI().contains("/login")
&& (cred = AutologinFilter.hasCookies(httpReq)) != null
- && cred.length == 2) {
+ && cred.length == AutologinFilter.COOKIE_DESC_LEN) {
httpResp.sendRedirect("j_security_check?j_username=" + cred[0]
- + "&j_password=" + PASS_TOKEN + TOKENIZER
- + httpReq.getRemoteAddr() + TOKENIZER
- + httpReq.getHeader("User-Agent") + TOKENIZER + cred[1]);
+ + "&j_password=" + PASS_TOKEN + TOKENIZER + cred[2]
+ + TOKENIZER + cred[1]);
return;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java 2006-11-01 00:23:55 UTC (rev 7261)
@@ -38,13 +38,12 @@
log.info(cred);
- if (cred != null && cred.length == 2) {
+ if (cred != null && cred.length == AutologinFilter.COOKIE_DESC_LEN) {
log.info("redirecting login " + cred[0] + " " + cred[1]);
String url = "j_security_check?j_username=" + cred[0]
- + "&j_password=" + PASS_TOKEN + TOKENIZER
- + request.getRemoteAddr() + TOKENIZER
- + request.getHeader("User-Agent") + TOKENIZER + cred[1];
+ + "&j_password=" + PASS_TOKEN + TOKENIZER + cred[2]
+ + TOKENIZER + cred[1];
url = response.encodeRedirectURL(url);
Added: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java 2006-11-01 00:23:55 UTC (rev 7261)
@@ -0,0 +1,37 @@
+package org.jboss.forge.portal;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class WrongLoginServlet extends HttpServlet {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ protected void doGet(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
+ String[] cred;
+
+ if ((cred = AutologinFilter.hasCookies(request)) != null
+ && (cred.length == AutologinFilter.COOKIE_DESC_LEN)) {
+ AutologinFilter.clearCookies(request, response);
+
+ if (request.getSession().getAttribute(AutologinFilter.ENTER_URI) != null) {
+ response.sendRedirect(request.getSession().getAttribute(
+ AutologinFilter.ENTER_URI).toString());
+ } else {
+ response.sendRedirect("/portal");
+ }
+ } else {
+ response
+ .sendRedirect("/portal/sec/portal/default/login/LoginWindow?action=1");
+ }
+ }
+
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2006-11-01 00:23:55 UTC (rev 7261)
@@ -33,13 +33,13 @@
</goal>
<goal name="build">
- <attainGoal name="buildGWT" />
+ <!--<attainGoal name="buildGWT" />
- <attainGoal name="prj-war-build" />
+ <attainGoal name="prj-war-build" />-->
</goal>
<goal name="deploy">
- <ant:copy file="target/tagme-servlet.war" toDir="${local.deploy.dir}" />
+ <!--<ant:copy file="target/tagme-servlet.war" toDir="${local.deploy.dir}" />-->
<!--<ant:copy file="target/tagme-servlet.war" toDir="/home/tomek/jboss/park_rozrywki/server/default/deploy" />-->
</goal>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jboss-portlet.xml 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jboss-portlet.xml 2006-11-01 00:23:55 UTC (rev 7261)
@@ -7,6 +7,7 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT</portlet-mode>
</supports>
<portlet-info>
<title>Wiki Portlet</title>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml 2006-11-01 00:23:55 UTC (rev 7261)
@@ -9,6 +9,7 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT</portlet-mode>
</supports>
<portlet-info>
<title>Wiki Portlet</title>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml 2006-11-01 00:23:55 UTC (rev 7261)
@@ -9,14 +9,14 @@
-->
<goal name="build">
- <!-- <attainGoal name="wiki:build" />-->
+ <attainGoal name="wiki:build" />
</goal>
<goal name="prj-install">
</goal>
<goal name="deploy">
- <!-- <attainGoal name="wiki:deploy" />-->
+ <attainGoal name="wiki:deploy" />
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/project.xml 2006-11-01 00:23:55 UTC (rev 7261)
@@ -147,6 +147,21 @@
<dependency>
<groupId>jboss</groupId>
+ <artifactId>jboss-portlet-api-lib</artifactId>
+ <version>1.0</version>
+ <jar>jboss-portlet-api-lib.jar</jar>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>portal-identity-lib</artifactId>
+ <version>1.0</version>
+ <jar>portal-identity-lib.jar</jar>
+ </dependency>
+
+
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>jbossall-client</artifactId>
<version>3.2.3</version>
</dependency>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java 2006-11-01 00:09:04 UTC (rev 7260)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java 2006-11-01 00:23:55 UTC (rev 7261)
@@ -21,6 +21,9 @@
*/
package org.jboss.wiki;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -34,9 +37,11 @@
import org.jboss.portal.common.transaction.TransactionException;
import org.jboss.portal.common.transaction.TransactionManagerProvider;
import org.jboss.portal.common.transaction.Transactions;
-import org.jboss.portal.core.model.Role;
import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portal.core.modules.RoleModule;
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.identity.User;
import org.jboss.portlet.JBossActionRequest;
import org.jboss.portlet.JBossRenderRequest;
@@ -70,16 +75,46 @@
}
+ public static Set<String> getRoleNames(User user, RoleModule roleModule) {
+ Set<String> ret = new HashSet<String>();
+ try {
+ for (Object roleObj : roleModule.getRoles(user)) {
+ ret.add(((Role) roleObj).getName());
+ }
+ } catch (IdentityException e) {
+ return ret;
+ }
+
+ return ret;
+ }
+
public void setParam(Object param) {
+
+ InitialContext initialContext;
+ RoleModule roleModule = null;
+
+ try {
+ initialContext = new InitialContext();
+ roleModule = (RoleModule) initialContext
+ .lookup(roleModulesCtx);
+
+ } catch (NamingException e) {
+ log.error(e);
+
+ // should throw an exception here
+ return;
+ }
+
+
if (param instanceof JBossActionRequest) {
JBossActionRequest jrReq = (JBossActionRequest) param;
if (jrReq.getUser() != null) {
name = jrReq.getUser().getUserName();
logedIn = true;
- isAdmin = jrReq.getUser().getRoleNames()
+ isAdmin = getRoleNames(jrReq.getUser(), roleModule)
.contains(adminRoleName);
- roles = jrReq.getUser().getRoleNames();
+ roles = getRoleNames(jrReq.getUser(), roleModule);
email = jrReq.getUser().getRealEmail();
}
@@ -89,33 +124,23 @@
if (jrReq.getUser() != null) {
name = jrReq.getUser().getUserName();
logedIn = true;
- isAdmin = jrReq.getUser().getRoleNames()
+ isAdmin = getRoleNames(jrReq.getUser(), roleModule)
.contains(adminRoleName);
- roles = jrReq.getUser().getRoleNames();
+ roles = getRoleNames(jrReq.getUser(), roleModule);
email = jrReq.getUser().getRealEmail();
} else {
name = "Unknown";
}
- InitialContext initialContext;
- try {
- initialContext = new InitialContext();
- RoleModule roleModule = (RoleModule) initialContext
- .lookup(roleModulesCtx);
-
- try {
- allRoles = roleModule.findRoles();
- } catch (ModuleException e) {
- log.error("Couldn't get roles from portal", e);
- }
-
- } catch (NamingException e) {
- log.error(e);
- }
-
} else {
log.error("You are not running JBoss Portal");
}
+
+ try {
+ allRoles = roleModule.findRoles();
+ } catch (IdentityException e) {
+ log.error("Couldn't get roles from portal", e);
+ }
}
public String getName() {
More information about the jboss-svn-commits
mailing list