getRequestedPermissions() {
- return requestList;
- }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.request/src/com/raytheon/uf/common/datadelivery/request/DataDeliveryAuthRequest.java b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/NwsAuthRequest.java
similarity index 57%
rename from edexOsgi/com.raytheon.uf.common.datadelivery.request/src/com/raytheon/uf/common/datadelivery/request/DataDeliveryAuthRequest.java
rename to edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/NwsAuthRequest.java
index e4f70ed5a8..25c77a0e9d 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.request/src/com/raytheon/uf/common/datadelivery/request/DataDeliveryAuthRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/NwsAuthRequest.java
@@ -17,17 +17,22 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
-package com.raytheon.uf.common.datadelivery.request;
+package com.raytheon.uf.common.plugin.nwsauth;
+import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+
import com.raytheon.uf.common.auth.req.AbstractPrivilegedRequest;
+import com.raytheon.uf.common.auth.req.IPermissionsService.IAuthorizedPermissionResponse;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/**
- * Authorization request for data delivery.
+ * Nws Authorization Request object.
*
*
*
@@ -35,8 +40,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * Apr 12, 2012 mpduff Initial creation
- * Oct 03, 2012 1241 djohnson Use {@link DataDeliveryPermission}.
+ * Jul 26, 2013 2232 mpduff Initial creation
*
*
*
@@ -44,7 +48,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0
*/
@DynamicSerialize
-public class DataDeliveryAuthRequest extends AbstractPrivilegedRequest implements ISerializableObject {
+public class NwsAuthRequest extends AbstractPrivilegedRequest implements
+ ISerializableObject, IAuthorizedPermissionResponse {
/**
* Authorized flag, true if authorized.
@@ -58,20 +63,31 @@ public class DataDeliveryAuthRequest extends AbstractPrivilegedRequest implement
@DynamicSerializeElement
private String notAuthorizedMessage = "Not Authorized";
+ /**
+ * List of requested permissions.
+ */
@DynamicSerializeElement
- private DataDeliveryPermissionsContainer permissionsContainer = new DataDeliveryPermissionsContainer();
+ @XmlElements({ @XmlElement(type = String.class) })
+ private List requestList = new ArrayList();
+
+ /**
+ * List of permissions that were authorized.
+ */
+ @DynamicSerializeElement
+ @XmlElements({ @XmlElement(type = String.class) })
+ private List authorizedList = new ArrayList();
/**
* Constructor
*/
- public DataDeliveryAuthRequest() {
+ public NwsAuthRequest() {
}
-
/**
* @return the authorized
*/
+ @Override
public boolean isAuthorized() {
return authorized;
}
@@ -103,8 +119,8 @@ public class DataDeliveryAuthRequest extends AbstractPrivilegedRequest implement
* @param permission
* Authorized permission
*/
- public void addAuthorized(DataDeliveryPermission permission) {
- this.permissionsContainer.addAuthorized(permission);
+ public void addAuthorized(String permission) {
+ this.authorizedList.add(permission);
}
/**
@@ -113,8 +129,8 @@ public class DataDeliveryAuthRequest extends AbstractPrivilegedRequest implement
*
* @param permission
*/
- public void addRequestedPermissions(DataDeliveryPermission permission) {
- addRequestedPermissions(new DataDeliveryPermission[] { permission });
+ public void addRequestedPermissions(String permission) {
+ this.addRequestedPermissions(permission);
}
/**
@@ -122,11 +138,11 @@ public class DataDeliveryAuthRequest extends AbstractPrivilegedRequest implement
*
* @param permissions
*/
- public void addRequestedPermissions(DataDeliveryPermission... permissions) {
- for (DataDeliveryPermission permission : permissions) {
- permissionsContainer.addRequestedPermission(permission);
+ public void addRequestedPermissions(String... permissions) {
+ for (String permission : permissions) {
+ this.requestList.add(permission);
}
- }
+ }
/**
* Check whether the authorizations allowed for this user contain a
@@ -136,38 +152,52 @@ public class DataDeliveryAuthRequest extends AbstractPrivilegedRequest implement
* the permission to check for
* @return true if the authorized list contains the permission
*/
- public boolean isAuthorized(DataDeliveryPermission permission) {
- return permissionsContainer.contains(permission);
+ public boolean isAuthorized(String permission) {
+ return this.authorizedList.contains(permission);
}
/**
- * @return
+ * @return the requestList
*/
- public List getRequestedPermissions() {
- return permissionsContainer.getRequestedPermissions();
+ public List getRequestedPermissions() {
+ return this.requestList;
}
/**
- * Added only to comply with dynamic serialization. DO NOT USE.
- *
- * @return the permissionsContainer
- * @deprecated added only to comply with dynamic serialization
+ * @return the requestList
*/
- @Deprecated
- public DataDeliveryPermissionsContainer getPermissionsContainer() {
- return permissionsContainer;
+ public List getRequestList() {
+ return requestList;
}
/**
- * Added only to comply with dynamic serialization. DO NOT USE.
- *
- * @param permissionsContainer
- * the permissionsContainer to set
- * @deprecated added only to comply with dynamic serialization
+ * @return the authorizedList
*/
- @Deprecated
- public void setPermissionsContainer(
- DataDeliveryPermissionsContainer permissionsContainer) {
- this.permissionsContainer = permissionsContainer;
+ public List getAuthorizedList() {
+ return authorizedList;
+ }
+
+ /**
+ * @param requestList
+ * the requestList to set
+ */
+ public void setRequestList(List requestList) {
+ this.requestList = requestList;
+ }
+
+ /**
+ * @param authorizedList
+ * the authorizedList to set
+ */
+ public void setAuthorizedList(List authorizedList) {
+ this.authorizedList = authorizedList;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean hasPermission(String permission) {
+ return isAuthorized();
}
}
diff --git a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/NwsPermission.java b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/NwsPermission.java
index 0fc804f04e..0755cbbd51 100644
--- a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/NwsPermission.java
+++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/NwsPermission.java
@@ -30,7 +30,8 @@ import com.raytheon.uf.common.auth.user.IPermission;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * Nov 5, 2012 1302 djohnson Initial creation
+ * Nov 05, 2012 1302 djohnson Initial creation
+ * Jul 26, 2031 2232 mpduff Renamed toString to getName.
*
*
*
@@ -40,8 +41,10 @@ import com.raytheon.uf.common.auth.user.IPermission;
public class NwsPermission implements IPermission {
+ /** Permission description */
private final String description;
+ /** Permission name */
private final String name;
/**
@@ -61,9 +64,11 @@ public class NwsPermission implements IPermission {
return description;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public String toString() {
+ public String getName() {
return name;
}
-
}
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
index 7a8e06f93d..ee2cfeba93 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
@@ -24,4 +24,6 @@ Require-Bundle: com.raytheon.uf.common.auth;bundle-version="1.12.1174",
com.raytheon.uf.common.datadelivery.event;bundle-version="1.0.0",
com.raytheon.uf.common.datadelivery.service;bundle-version="1.0.0",
org.springframework;bundle-version="2.5.6",
- com.raytheon.uf.edex.datadelivery.retrieval;bundle-version="1.0.0"
+ com.raytheon.uf.edex.datadelivery.retrieval;bundle-version="1.0.0",
+ com.raytheon.uf.edex.plugin.nwsauth;bundle-version="1.12.1174",
+ com.raytheon.uf.common.plugin.nwsauth;bundle-version="1.12.1174"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
index fec53fa949..256b205f33 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-service-handlers.xml
@@ -6,7 +6,7 @@
class="com.raytheon.uf.edex.datadelivery.service.services.DataDeliveryPrivilegedRequestHandler" />
+ value="com.raytheon.uf.common.plugin.nwsauth.NwsAuthRequest" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/DataDeliveryPrivilegedRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/DataDeliveryPrivilegedRequestHandler.java
index 607ab857aa..2ab07f4772 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/DataDeliveryPrivilegedRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/DataDeliveryPrivilegedRequestHandler.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.datadelivery.service.services;
import com.raytheon.uf.common.auth.exception.AuthorizationException;
import com.raytheon.uf.common.auth.req.AbstractPrivilegedRequest;
import com.raytheon.uf.common.auth.user.IUser;
-import com.raytheon.uf.common.datadelivery.request.DataDeliveryAuthRequest;
import com.raytheon.uf.common.datadelivery.request.DataDeliveryPermission;
+import com.raytheon.uf.common.plugin.nwsauth.NwsAuthRequest;
import com.raytheon.uf.edex.auth.AuthManager;
import com.raytheon.uf.edex.auth.AuthManagerFactory;
import com.raytheon.uf.edex.auth.req.AbstractPrivilegedRequestHandler;
@@ -39,8 +39,9 @@ import com.raytheon.uf.edex.auth.roles.IRoleStorage;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * Apr 12, 2012 224 mpduff Initial creation
- * Oct 03, 2012 1241 djohnson Use {@link DataDeliveryPermission}.
+ * Apr 12, 2012 224 mpduff Initial creation
+ * Oct 03, 2012 1241 djohnson Use {@link DataDeliveryPermission}.
+ * Jul 26, 2031 2232 mpduff Refactored Data Delivery permissions.
*
*
*
@@ -48,8 +49,8 @@ import com.raytheon.uf.edex.auth.roles.IRoleStorage;
* @version 1.0
*/
-public class DataDeliveryPrivilegedRequestHandler extends
- AbstractPrivilegedRequestHandler {
+public class DataDeliveryPrivilegedRequestHandler
+ extends AbstractPrivilegedRequestHandler {
/*
* (non-Javadoc)
@@ -62,33 +63,32 @@ public class DataDeliveryPrivilegedRequestHandler
*
* @author bphillip
@@ -48,11 +50,6 @@ public class RegistryRemoteRequestWrapper extends RemoteRequestRouteWrapper
@Override
public byte[] request(byte[] data) {
- return executeThrift(data);
+ return executeThrift(new ByteArrayInputStream(data));
}
-
- public byte[] executeThrift(byte[] data) {
- return super.executeThrift(new ByteArrayInputStream(data));
- }
-
}
diff --git a/tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java b/tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java
index 8120bde00d..299c3f7347 100644
--- a/tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java
+++ b/tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java
@@ -43,6 +43,7 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import com.raytheon.uf.common.auth.req.IPermissionsService;
import com.raytheon.uf.common.datadelivery.bandwidth.IBandwidthService;
import com.raytheon.uf.common.datadelivery.bandwidth.IProposeScheduleResponse;
import com.raytheon.uf.common.datadelivery.registry.AdhocSubscription;
@@ -77,6 +78,7 @@ import com.raytheon.uf.viz.datadelivery.subscription.SubscriptionService.IForceA
* Nov 20, 2012 1286 djohnson Rewrite to support proposing subscription stores/updates and force applying.
* Jan 02, 2012 1345 djohnson Fix broken tests from using VizApp to move work off the UI thread.
* May 08, 2000 2013 djohnson Allow checks for duplicate subscriptions.
+ * Jul 26, 2031 2232 mpduff Refactored Data Delivery permissions.
*
*
*
@@ -112,7 +114,7 @@ public abstract class AbstractSubscriptionServiceTest {
final IBandwidthService mockBandwidthService = mock(IBandwidthService.class);
- final IPermissionsService permissionsService = mock(IPermissionsService.class);
+ final IPermissionsService permissionsService = mock(RequestFromServerPermissionsService.class);
final ISubscriptionOverlapService subscriptionOverlapService = mock(ISubscriptionOverlapService.class);
@@ -351,6 +353,7 @@ public abstract class AbstractSubscriptionServiceTest {
throws RegistryHandlerException {
// Not valid for adhocs
}
+
/**
* Verifies that the only interactions with the subscription handler are to
* check for duplicate/overlapping subscriptions.
@@ -506,4 +509,3 @@ public abstract class AbstractSubscriptionServiceTest {
*/
abstract ForceApplyPromptConfiguration getExpectedForceApplyPromptConfiguration();
}
-
diff --git a/tests/unit/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionServiceMassUpdateTest.java b/tests/unit/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionServiceMassUpdateTest.java
index 465e2ecefe..9ee9619227 100644
--- a/tests/unit/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionServiceMassUpdateTest.java
+++ b/tests/unit/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionServiceMassUpdateTest.java
@@ -35,18 +35,18 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
+import com.raytheon.uf.common.auth.AuthException;
+import com.raytheon.uf.common.auth.req.IPermissionsService.IAuthorizedPermissionResponse;
import com.raytheon.uf.common.auth.user.IUser;
import com.raytheon.uf.common.datadelivery.bandwidth.IProposeScheduleResponse;
import com.raytheon.uf.common.datadelivery.registry.InitialPendingSiteSubscription;
import com.raytheon.uf.common.datadelivery.registry.Subscription;
import com.raytheon.uf.common.datadelivery.registry.handlers.DataDeliveryHandlers;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
-import com.raytheon.uf.common.datadelivery.request.DataDeliveryPermission;
import com.raytheon.uf.common.registry.handler.RegistryHandlerException;
import com.raytheon.uf.common.registry.handler.RegistryObjectHandlersUtil;
import com.raytheon.uf.common.util.CollectionUtil;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.datadelivery.subscription.IPermissionsService.IAuthorizedPermissionResponse;
import com.raytheon.uf.viz.datadelivery.subscription.ISubscriptionService.ISubscriptionServiceResult;
/**
@@ -61,6 +61,7 @@ import com.raytheon.uf.viz.datadelivery.subscription.ISubscriptionService.ISubsc
* ------------ ---------- ----------- --------------------------
* Nov 21, 2012 1286 djohnson Initial creation
* May 08, 2000 2013 djohnson Allow checks for duplicate subscriptions.
+ * Jul 26, 2031 2232 mpduff Refactored Data Delivery permissions.
*
*
*
@@ -73,7 +74,7 @@ public class SubscriptionServiceMassUpdateTest extends
private final IAuthorizedPermissionResponse authorizedPermissionsResponse = mock(IAuthorizedPermissionResponse.class);
@Before
- public void setUpPermissionsResponse() throws VizException {
+ public void setUpPermissionsResponse() throws VizException, AuthException {
userHasAllPermissions();
}
@@ -145,7 +146,7 @@ public class SubscriptionServiceMassUpdateTest extends
@Test
public void testUpdateWithPendingCheckNotifiesOfPendingSubscriptionsCreated()
- throws RegistryHandlerException, VizException {
+ throws RegistryHandlerException, VizException, AuthException {
RegistryObjectHandlersUtil.initMocks();
returnZeroSubscriptionNamesWhenProposeScheduleCalled();
@@ -182,12 +183,13 @@ public class SubscriptionServiceMassUpdateTest extends
* @param subscription
* the subscription
* @throws VizException
+ * @throws AuthException
*/
private void subscriptionCantBeChangedByUser(Subscription subscription)
- throws VizException {
+ throws VizException, AuthException {
IAuthorizedPermissionResponse noPermission = mock(IAuthorizedPermissionResponse.class);
when(
- permissionsService
+ ((RequestFromServerPermissionsService) permissionsService)
.checkPermissionToChangeSubscription(any(IUser.class),
any(String.class), same(subscription)))
.thenReturn(noPermission);
@@ -313,18 +315,19 @@ public class SubscriptionServiceMassUpdateTest extends
return null;
}
- private void userHasAllPermissions() throws VizException {
+ private void userHasAllPermissions() throws VizException, AuthException {
when(
permissionsService.checkPermission(any(IUser.class),
- anyString(), any(DataDeliveryPermission.class)))
- .thenReturn(authorizedPermissionsResponse);
+ anyString(), any(String.class))).thenReturn(
+ authorizedPermissionsResponse);
when(
permissionsService.checkPermissions(any(IUser.class),
- anyString(), any(DataDeliveryPermission.class)))
- .thenReturn(authorizedPermissionsResponse);
+ anyString(), any(String.class))).thenReturn(
+ authorizedPermissionsResponse);
when(
- permissionsService.checkPermissionToChangeSubscription(
- any(IUser.class), anyString(), any(Subscription.class)))
+ ((RequestFromServerPermissionsService) permissionsService)
+ .checkPermissionToChangeSubscription(any(IUser.class),
+ anyString(), any(Subscription.class)))
.thenReturn(authorizedPermissionsResponse);
when(authorizedPermissionsResponse.isAuthorized()).thenReturn(true);
}
@@ -352,8 +355,7 @@ public class SubscriptionServiceMassUpdateTest extends
getExpectedForceApplyMessage(),
IProposeScheduleResponse.VALUE_NOT_SET,
IProposeScheduleResponse.VALUE_NOT_SET,
- IProposeScheduleResponse.VALUE_NOT_SET,
- mockPromptDisplayText,
+ IProposeScheduleResponse.VALUE_NOT_SET, mockPromptDisplayText,
getExpectedDisplayForceApplyPromptSubscription(),
subNameResults);
}