Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/05/09 14:55:10 (15 years ago)
Author:
asimon
Message:

error correction (ticket #537)

Location:
trunk/sources/HeuristicLab.Security.Core/3.2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Security.Core/3.2/HeuristicLab.Security.Core-3.2.csproj

    r1729 r1738  
    3737    <Reference Include="System.Core">
    3838      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     39    </Reference>
     40    <Reference Include="System.ServiceModel">
     41      <RequiredTargetFramework>3.0</RequiredTargetFramework>
    3942    </Reference>
    4043    <Reference Include="System.Xml.Linq">
  • trunk/sources/HeuristicLab.Security.Core/3.2/PermissionManager.cs

    r1737 r1738  
    99using HeuristicLab.PluginInfrastructure;
    1010using System.Security.Cryptography;
     11using System.ServiceModel;
    1112
    1213namespace HeuristicLab.Security.Core {
     
    6061        User user = userAdapter.GetByLogin(userName);
    6162
    62         if (user != null && 
     63        if (user != null &&
    6364            user.Password.Equals(password)) {
    6465          Guid newSessionId = Guid.NewGuid();
     
    6869        } else return Guid.Empty;
    6970      }
     71      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    7072      finally {
    7173        if (session != null)
     
    100102          else return false;
    101103        }
     104        catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    102105        finally {
    103106          if (session != null)
  • trunk/sources/HeuristicLab.Security.Core/3.2/SecurityCoreTest.cs

    r1729 r1738  
    1717        User user = new User();
    1818        user.Login = "anna";
    19         user.Password = "blubb";
     19        user.SetHashedPassword("blubb");
    2020        user.Name = "Anna";
    2121        user = manager.AddNewUser(user);
     
    7373        User user = new User();
    7474        user.Login = "anna";
    75         user.Password = "blubb";
     75        user.SetHashedPassword("blubb");
    7676        user.Name = "Anna";
    7777        user = manager.AddNewUser(user);
     
    107107        User user = new User();
    108108        user.Login = "anna";
    109         user.Password = "blubb";
     109        user.SetHashedPassword("blubb");
    110110        user.Name = "Anna";
    111111        user = manager.AddNewUser(user);
     
    113113        User user2 = new User();
    114114        user2.Login = "stefan";
    115         user2.Password = "foo";
     115        user2.SetHashedPassword("foo");
    116116        user2.Name = "Stefan";
    117117
  • trunk/sources/HeuristicLab.Security.Core/3.2/SecurityManager.cs

    r1729 r1738  
    88using HeuristicLab.PluginInfrastructure;
    99using HeuristicLab.DataAccess.Interfaces;
     10using System.ServiceModel;
    1011
    1112namespace HeuristicLab.Security.Core {
     
    3132        return user;
    3233      }
     34      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    3335      finally {
    3436        if (session != null)
     
    5153        return user;
    5254      }
     55      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    5356      finally {
    5457        if (session != null)
     
    7275        return false;
    7376      }
     77      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    7478      finally {
    7579        if (session != null)
     
    8993        return userAdapter.GetAll();
    9094      }
     95      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    9196      finally {
    9297        if (session != null)
     
    107112        return userAdapter.GetByName(name);
    108113      }
     114      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    109115      finally {
    110116        if (session != null)
     
    128134        return userGroup;
    129135      }
     136      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    130137      finally {
    131138        if (session != null)
     
    149156        return userGroup;
    150157      }
     158      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    151159      finally {
    152160        if (session != null)
     
    171179        return false;
    172180      }
     181      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    173182      finally {
    174183        if (session != null)
     
    188197        return userGroupAdapter.GetAll();
    189198       }
     199      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    190200      finally {
    191201        if (session != null)
     
    206216        return userGroupAdapter.GetByName(name);
    207217      }
     218      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    208219      finally {
    209220        if (session != null)
     
    227238        return permissionOwner;
    228239      }
     240      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    229241      finally {
    230242        if (session != null)
     
    258270        return false;
    259271      }
     272      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    260273      finally {
    261274        if (session != null)
     
    290303        return false;
    291304      }
     305      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    292306      finally {
    293307        if (session != null)
     
    310324        return permissionAdapter.grantPermission(permissionOwnerId, permissionId, entityId);
    311325      }
     326      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    312327      finally {
    313328        if (session != null)
     
    328343        return permissionAdapter.GetById(permissionId);
    329344      }
     345      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    330346      finally {
    331347        if (session != null)
     
    348364        return permissionAdapter.revokePermission(permissionOwnerId, permissionId, entityId);
    349365      }
     366      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    350367      finally {
    351368        if (session != null)
     
    366383          return null;
    367384      }
     385      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    368386      finally {
    369387        if (session != null)
     
    383401          return false;
    384402      }
     403      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    385404      finally {
    386405        if (session != null)
     
    401420          return null;
    402421      }
     422      catch (Exception ex) { throw new FaultException("Server: " + ex.Message); }
    403423      finally {
    404424        if (session != null)
Note: See TracChangeset for help on using the changeset viewer.