mx4j/src/test/test/javax/management/remote RemoteSecurityManagerTestCase.java,1.2,1.3

Update of /cvsroot/mx4j/mx4j/src/test/test/javax/management/remote
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14378/src/test/test/javax/management/remote

Modified Files:
	RemoteSecurityManagerTestCase.java 
Log Message:
Fixed tests to follow the new security implementation

Index: RemoteSecurityManagerTestCase.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/test/test/javax/management/remote/RemoteSecurityManagerTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RemoteSecurityManagerTestCase.java	4 Sep 2004 15:44:25 -0000	1.2
--- RemoteSecurityManagerTestCase.java	30 Oct 2004 17:06:01 -0000	1.3
***************
*** 228,231 ****
--- 228,239 ----
           policy.setSeparateClientServerPermissions(true);
  
+          Map clientEnv = createClientEnvironment();
+          clientEnv.put(JMXConnector.CREDENTIALS, new String[]{"test", "test"});
+          // Allow this client to open a socket to connect to the server
+          policy.addClientPermission(new SocketPermission("localhost:" + url.getPort(), "connect"));
+          // Allow the authenticated subject to listen and accept a connection
+          policy.addServerPermission(new JMXPrincipal("test"), new SocketPermission("localhost:" + url.getPort(), "listen"));
+          policy.addServerPermission(new JMXPrincipal("test"), new SocketPermission("*:1024-" + url.getPort(), "accept"));
+ 
           // No credentials
           try
***************
*** 239,243 ****
  
           // Bad credentials
!          Map clientEnv = createClientEnvironment();
           clientEnv.put(JMXConnector.CREDENTIALS, null);
           try
--- 247,251 ----
  
           // Bad credentials
!          clientEnv = createClientEnvironment();
           clientEnv.put(JMXConnector.CREDENTIALS, null);
           try
***************
*** 322,363 ****
           }
  
-          // Client has no permission to open sockets
-          clientEnv = createClientEnvironment();
-          clientEnv.put(JMXConnector.CREDENTIALS, new String[]{"test", "test"});
-          try
-          {
-             JMXConnectorFactory.connect(cntorServer.getAddress(), clientEnv);
-             fail();
-          }
-          catch (SecurityException x)
-          {
-          }
- 
-          clientEnv = createClientEnvironment();
-          clientEnv.put(JMXConnector.CREDENTIALS, new String[]{"test", "test"});
-          // Allow this client to open a socket to connect to the server
-          policy.addClientPermission(new SocketPermission("localhost:" + url.getPort(), "connect"));
-          // Allow any client to connect to the server
-          addPermission(new SocketPermission("*:1024-" + url.getPort(), "accept"));
-          // This below is an implementation detail, but for now I cannot remove it
-          policy.addServerPermission(new JMXPrincipal("test"), new AuthPermission("doAsPrivileged"));
- 
-          // Authenticated subject has no permission to open sockets
-          clientEnv = createClientEnvironment();
-          clientEnv.put(JMXConnector.CREDENTIALS, new String[]{"test", "test"});
-          try
-          {
-             JMXConnectorFactory.connect(cntorServer.getAddress(), clientEnv);
-             fail();
-          }
-          catch (SecurityException x)
-          {
-          }
- 
           clientEnv = createClientEnvironment();
           clientEnv.put(JMXConnector.CREDENTIALS, new String[]{"test", "test"});
-          // Allow the authenticated subject to listen and accept a connection
-          policy.addServerPermission(new JMXPrincipal("test"), new SocketPermission("localhost:" + url.getPort(), "listen"));
-          policy.addServerPermission(new JMXPrincipal("test"), new SocketPermission("*:1024-" + url.getPort(), "accept"));
           cntor = JMXConnectorFactory.connect(cntorServer.getAddress(), clientEnv);
        }
--- 330,335 ----
***************
*** 483,487 ****
  
           addPermission(new MBeanTrustPermission("*"));
!          policy.addServerPermission(new JMXPrincipal("test"), new MBeanPermission("*", "instantiate, registerMBean, getAttribute"));
           policy.addServerPermission(new JMXPrincipal("test"), new SubjectDelegationPermission(JMXPrincipal.class.getName() + ".delegate"));
  
--- 455,459 ----
  
           addPermission(new MBeanTrustPermission("*"));
!          policy.addServerPermission(new JMXPrincipal("delegate"), new MBeanPermission("*", "instantiate, registerMBean, getAttribute"));
           policy.addServerPermission(new JMXPrincipal("test"), new SubjectDelegationPermission(JMXPrincipal.class.getName() + ".delegate"));
  
***************
*** 492,496 ****
           ObjectName name = ObjectName.getInstance(":name=subject");
           cntion.createMBean(SubjectCheck.class.getName(), name, null);
!          policy.addServerPermission(new JMXPrincipal("test"), new AuthPermission("getSubject"));
           Subject subject = (Subject)cntion.getAttribute(name, "Subject");
  
--- 464,468 ----
           ObjectName name = ObjectName.getInstance(":name=subject");
           cntion.createMBean(SubjectCheck.class.getName(), name, null);
!          policy.addServerPermission(new JMXPrincipal("delegate"), new AuthPermission("getSubject"));
           Subject subject = (Subject)cntion.getAttribute(name, "Subject");
  



-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click