Changeset 4021

Timestamp:

07/08/10 23:13:56 (14 years ago)

Author:

bfarka

Message:

 

Location:

branches/HeuristicLab.Services.Authentication Prototype

Files:

• Service/App.config (modified) (2 diffs)
• Service/Services/Administration/AuthorizationManagementService.cs (modified) (2 diffs)
• Service/Services/Administration/IAuthorizationManagementService.cs (modified) (2 diffs)
• UnitTests/app.config (modified) (2 diffs)
• UnitTests/service/AbstractHeuristicLabServiceTest.cs (modified) (1 diff)
• UnitTests/service/HeuristicLabManagementServiceTest.cs (modified) (3 diffs)

branches/HeuristicLab.Services.Authentication Prototype/Service/App.config

@@ -8 +8 @@
           <add
             name="HeuristiclabMemberShipProvider"
-            type="Service.Provider.HeuristicLabMembershipProvider, Service"
+            type="Service.Provider.HeuristicLabRoleProvider, Service"
+            applicationName="HeuristicLabServices"
             passwordFormat= "Hashed"/>
         </providers>
       </membership>
+    <roleManager enabled ="true"
+   defaultProvider ="HeuristicLabRoleProvider" >
+      <providers>
+        <clear/>
+        <add name ="HeuristicLabRoleProvider"
+          type="Service.Provider.HeuristicLabRoleProivder, Service"
+          applicationName="HeuristiclLabServices"/>
+      </providers>
+    </roleManager>
+
   </system.web>
   <system.serviceModel>
@@ -27 +38 @@
       <serviceBehaviors>
         <behavior name="HttpServiceBehavior">
+          <serviceAuthorization principalPermissionMode ="UseAspNetRoles"
+                        roleProviderName ="HeuristicLabRoleProvider" />
           <serviceCredentials>
-            
             <userNameAuthentication membershipProviderName="HeuristiclabMemberShipProvider" userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Service.Provider.HeuristicLabUsernamePasswordValidator, Service" />
             <!-- the name and store of the certificate has to be customized for each server to run-->

branches/HeuristicLab.Services.Authentication Prototype/Service/Services/Administration/AuthorizationManagementService.cs

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using System.Security.Permissions;
 
 namespace Service.Services.Administration {
@@ -8 +9 @@
     #region IAuthorizationManagementService Member
 
+   
     public void CreateRole(string roleName, bool isPermission) {
       new Service.Provider.HeuristicLabRoleProvider().CreateRole(roleName, isPermission);

branches/HeuristicLab.Services.Authentication Prototype/Service/Services/Administration/IAuthorizationManagementService.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ServiceModel;
+using System.ServiceModel;
+using System.Security.Permissions;
 
 namespace Service.Services.Administration {
@@ -10 +7 @@
 
     [OperationContract]
+    [PrincipalPermission(SecurityAction.PermitOnly, Role = "Admin")]
     void CreateRole(string roleName, bool isPermission);
 

branches/HeuristicLab.Services.Authentication Prototype/UnitTests/app.config

@@ -3 +3 @@
   <system.web>
     <compilation debug="true" />
+    <roleManager enabled ="true"
+   defaultProvider ="HeuristicLabRoleProvider" >
+      <providers>
+
+        <add name ="HeuristicLabRoleProvider"
+          type="Service.Provider.HeuristicLabRoleProvider, Service"
+          applicationName="HeuristiclLabServices"/>
+      </providers>
+    </roleManager>
     <membership defaultProvider="HeuristiclabMemberShipProvider" userIsOnlineTimeWindow="15">
       <providers>
@@ -68 +77 @@
       <serviceBehaviors>
         <behavior name="HttpServiceBehavior">
+          <serviceAuthorization principalPermissionMode ="UseAspNetRoles"
+                        roleProviderName ="HeuristicLabRoleProvider" />
           <serviceCredentials>
-
             <userNameAuthentication membershipProviderName="HeuristiclabMemberShipProvider" userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Service.Provider.HeuristicLabUsernamePasswordValidator, Service" />
             <serviceCertificate findValue="MyServerCert" x509FindType="FindBySubjectName" storeLocation="LocalMachine" storeName="My" />

branches/HeuristicLab.Services.Authentication Prototype/UnitTests/service/AbstractHeuristicLabServiceTest.cs

@@ -20 +20 @@
 
     [TestCleanup()]
-    public virtual void closeDBConnection() {
+    public override void closeDBConnection() {
       sh.Close();
       base.closeDBConnection();

branches/HeuristicLab.Services.Authentication Prototype/UnitTests/service/HeuristicLabManagementServiceTest.cs

@@ -5 +5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Web.Security;
+using Service.Provider;
 
 namespace UnitTests.service {
@@ -34 +35 @@
       provider.CreateUser("testUser", "mypassword", "myMail", "question", "answer", true, null,out status);
       Assert.AreEqual(MembershipCreateStatus.Success, status);
+      HeuristicLabRoleProvider roleProvider = new HeuristicLabRoleProvider();
+      roleProvider.CreateRole("Admin");
+      roleProvider.AddUsersToRoles(new String[1]{"testUser"},new String[1]{"Admin"});
 
       AuthorizationManagementServiceRemote.AuthorizationManagementServiceClient client = new AuthorizationManagementServiceRemote.AuthorizationManagementServiceClient();
@@ -39 +43 @@
       client.ClientCredentials.UserName.Password = "mypassword";
       client.CreateRole("roleName", true);
+      roleProvider.RemoveUsersFromRoles(new String[1] { "testUser" }, new String[1] { "Admin" });
+      try {
+        client.CreateRole("roleName", true);
+        Assert.Fail();
+      }
+      catch (Exception) {
+        //should throw exception
+      }
+
+
     }