Author: scottbw
Date: Tue Mar 4 11:52:12 2014
New Revision: 1574046
URL: http://svn.apache.org/r1574046
Log:
Replaced calls to decryptAuthToken with calls to validateAuthToken. The
difference is that the validate method also checks expiry times on tokens. The
call decrpytAuthToken will be made private to avoid this problem in future.
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/ext/WookieAPIImpl.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/oauth/oAuthClient.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/wave/WaveAPIImpl.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/proxy/ProxyServlet.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/LocalizedResourceFilter.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/SiblingPageNormalizer.java
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/ext/WookieAPIImpl.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/ext/WookieAPIImpl.java?rev=1574046&r1=1574045&r2=1574046&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/ext/WookieAPIImpl.java
(original)
+++
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/ext/WookieAPIImpl.java
Tue Mar 4 11:52:12 2014
@@ -47,7 +47,7 @@ public class WookieAPIImpl implements IW
Messages localizedMessages = LocaleHandler.localizeMessages(request);
try {
- AuthToken authToken = AuthTokenUtils.decryptAuthToken(id_key);
+ AuthToken authToken = AuthTokenUtils.validateAuthToken(id_key);
Notifier.callSiblings(authToken,"Widget.onLocked(\""+authToken.getContextId()+"\");");//$NON-NLS-1$
//TODO
//WidgetInstancesController.lockWidgetInstance(widgetInstance);
@@ -65,7 +65,7 @@ public class WookieAPIImpl implements IW
HttpServletRequest request =
WebContextFactory.get().getHttpServletRequest();
Messages localizedMessages = LocaleHandler.localizeMessages(request);
try {
- AuthToken authToken = AuthTokenUtils.decryptAuthToken(id_key);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(id_key);
Notifier.callSiblings(authToken,"Widget.onUnlocked(\""+authToken.getContextId()+"\");");//$NON-NLS-1$
//TODO
//WidgetInstancesController.unlocklockWidgetInstance(widgetInstance);
@@ -84,7 +84,7 @@ public class WookieAPIImpl implements IW
HttpServletRequest request =
WebContextFactory.get().getHttpServletRequest();
Messages localizedMessages = LocaleHandler.localizeMessages(request);
try {
- AuthToken authToken = AuthTokenUtils.decryptAuthToken(id_key);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(id_key);
Notifier.callSiblings(authToken,"window.onHide()");//$NON-NLS-1$
return "okay"; //$NON-NLS-1$
} catch (InvalidAuthTokenException e) {
@@ -100,7 +100,7 @@ public class WookieAPIImpl implements IW
HttpServletRequest request =
WebContextFactory.get().getHttpServletRequest();
Messages localizedMessages = LocaleHandler.localizeMessages(request);
try {
- AuthToken authToken = AuthTokenUtils.decryptAuthToken(id_key);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(id_key);
Notifier.callSiblings(authToken,"window.onShow()");//$NON-NLS-1$
return "okay"; //$NON-NLS-1$
} catch (InvalidAuthTokenException e) {
@@ -136,7 +136,7 @@ public class WookieAPIImpl implements IW
HttpServletRequest request =
WebContextFactory.get().getHttpServletRequest();
Messages localizedMessages = LocaleHandler.localizeMessages(request);
try {
- AuthToken authToken = AuthTokenUtils.decryptAuthToken(id_key);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(id_key);
//TODO
//if(widgetInstance.isLocked()) return
localizedMessages.getString("WidgetAPIImpl.2");
new SharedContext(authToken).updateSharedData(key, value,
true);
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/oauth/oAuthClient.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/oauth/oAuthClient.java?rev=1574046&r1=1574045&r2=1574046&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/oauth/oAuthClient.java
(original)
+++
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/oauth/oAuthClient.java
Tue Mar 4 11:52:12 2014
@@ -86,7 +86,7 @@ public class oAuthClient implements IFea
if(idKey == null) return "invalid";
try {
- AuthToken authToken =
AuthTokenUtils.decryptAuthToken(idKey);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(idKey);
IOAuthToken oauthToken =
OAuthService.Factory.getInstance().getOAuthToken(authToken.toString());
if (oauthToken != null) {
if (!oauthToken.isExpires())
@@ -102,7 +102,7 @@ public class oAuthClient implements IFea
public void invalidateToken(String idKey) {
if(idKey == null) return;
try {
- AuthToken authToken =
AuthTokenUtils.decryptAuthToken(idKey);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(idKey);
IOAuthToken oauthToken =
OAuthService.Factory.getInstance().getOAuthToken(authToken.toString());
if (oauthToken != null) {
OAuthService.Factory.getInstance().deleteOAuthToken(authToken.toString());
@@ -118,7 +118,7 @@ public class oAuthClient implements IFea
AuthToken authToken;
try {
- authToken = AuthTokenUtils.decryptAuthToken(idKey);
+ authToken = AuthTokenUtils.validateAuthToken(idKey);
Map<String, String> oAuthParams = queryXMLParams(idKey);
if (oAuthParams == null) {
return "invalid";
@@ -146,7 +146,7 @@ public class oAuthClient implements IFea
public Map<String, String> queryXMLParams(String idKey) {
try {
- AuthToken authToken =
AuthTokenUtils.decryptAuthToken(idKey);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(idKey);
IWidget widget =
WidgetMetadataService.Factory.getInstance().getWidget(authToken.getWidgetId());
Collection<org.apache.wookie.w3c.IFeature>
widgetFeatures = widget.getFeatures();
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/wave/WaveAPIImpl.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/wave/WaveAPIImpl.java?rev=1574046&r1=1574045&r2=1574046&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/wave/WaveAPIImpl.java
(original)
+++
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/feature/wave/WaveAPIImpl.java
Tue Mar 4 11:52:12 2014
@@ -94,7 +94,7 @@ public class WaveAPIImpl implements IFea
}
// check if token is valid
try {
- AuthToken authToken =
AuthTokenUtils.decryptAuthToken(id_key);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(id_key);
for (ISharedData data:
SharedContextService.Factory.getInstance().getSharedData(authToken.getApiKey(),
authToken.getWidgetId(), authToken.getContextId())){
state.put(data.getDkey(), data.getDvalue());
}
@@ -155,7 +155,7 @@ public class WaveAPIImpl implements IFea
Messages localizedMessages =
LocaleHandler.localizeMessages(request);
try {
- AuthToken authToken =
AuthTokenUtils.decryptAuthToken(id_key);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(id_key);
// TODO
// if(widgetInstance.isLocked()) return
localizedMessages.getString("WidgetAPIImpl.2"); //$NON-NLS-1$
@@ -171,7 +171,7 @@ public class WaveAPIImpl implements IFea
private SharedContext getSharedContext(String id_key){
try {
- AuthToken authToken =
AuthTokenUtils.decryptAuthToken(id_key);
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(id_key);
return new SharedContext(authToken);
} catch (InvalidAuthTokenException e) {
return null;
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/proxy/ProxyServlet.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/proxy/ProxyServlet.java?rev=1574046&r1=1574045&r2=1574046&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/proxy/ProxyServlet.java
(original)
+++
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/proxy/ProxyServlet.java
Tue Mar 4 11:52:12 2014
@@ -86,7 +86,7 @@ public class ProxyServlet extends HttpSe
//
AuthToken authToken = null;
try {
- authToken =
AuthTokenUtils.decryptAuthToken(request.getParameter("instanceid_key"));
+ authToken =
AuthTokenUtils.validateAuthToken(request.getParameter("instanceid_key"));
} catch (Exception e1) {
if (!isDefaultGadget(request)){
response.sendError(HttpServletResponse.SC_FORBIDDEN,"<error>"+UNAUTHORISED_MESSAGE+"</error>");
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/LocalizedResourceFilter.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/LocalizedResourceFilter.java?rev=1574046&r1=1574045&r2=1574046&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/LocalizedResourceFilter.java
(original)
+++
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/server/LocalizedResourceFilter.java
Tue Mar 4 11:52:12 2014
@@ -246,7 +246,7 @@ public class LocalizedResourceFilter imp
if (idkey != null){
AuthToken authToken;
try {
- authToken = AuthTokenUtils.decryptAuthToken(idkey);
+ authToken = AuthTokenUtils.validateAuthToken(idkey);
IWidget widget =
WidgetMetadataService.Factory.getInstance().getWidget(authToken.getWidgetId());
filterConfig.getServletContext().setAttribute("widget-id",
widget.getIdentifier());
filterConfig.getServletContext().setAttribute("widget-instance-locale",
authToken.getLang());
Modified:
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/SiblingPageNormalizer.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/SiblingPageNormalizer.java?rev=1574046&r1=1574045&r2=1574046&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/SiblingPageNormalizer.java
(original)
+++
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/util/SiblingPageNormalizer.java
Tue Mar 4 11:52:12 2014
@@ -69,7 +69,7 @@ org.directwebremoting.extend.PageNormali
// the Widget URL it uniquely identifies sibling instances
try {
- AuthToken authToken =
AuthTokenUtils.decryptAuthToken(parmsMap.get("idkey"));
+ AuthToken authToken =
AuthTokenUtils.validateAuthToken(parmsMap.get("idkey"));
// Strip off query and add on API key and shared data
key
setNormalizeIncludesQueryString(false);
page = super.normalizePage(page);
