Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 23 files changed
  • 0 commit comments
  • 1 contributor
Showing with 1,257 additions and 994 deletions.
  1. +43 −0 Azure/WebSite (WindowsAzure).Azure/ServiceConfiguration.cscfg
  2. +12 −2 Libraries/Thinktecture.IdentityServer.Core.Repositories/ConfigurationRepository.cs
  3. +95 −92 Libraries/Thinktecture.IdentityServer.Core.Repositories/Thinktecture.IdentityServer.Core.Repositories.csproj
  4. +24 −24 Libraries/Thinktecture.IdentityServer.Core/Endpoints.cs
  5. +145 −142 Libraries/Thinktecture.IdentityServer.Core/Thinktecture.IdentityServer.Core.csproj
  6. +1 −0  Libraries/Thinktecture.IdentityServer.Web.Library/Controller/FederationMetadataController.cs
  7. +1 −0  Libraries/Thinktecture.IdentityServer.Web.Library/Controller/HomeController.cs
  8. +120 −117 Libraries/Thinktecture.IdentityServer.Web.Library/Thinktecture.IdentityServer.Web.Library.csproj
  9. +85 −98 OnPremise/{Thinktecture.IdentityServer.sln → AppHarbor.sln}
  10. BIN  OnPremise/WebSite/App_Data/IdentityServerConfiguration.sdf
  11. +8 −0 OnPremise/WebSite/Configuration/connectionStrings.release.config
  12. +1 −1  OnPremise/WebSite/Configuration/wif.config
  13. +1 −1  OnPremise/WebSite/Global.asax.cs
  14. +205 −65 OnPremise/WebSite/Views/Account/SignIn.cshtml
  15. +65 −0 OnPremise/WebSite/Views/Account/SignIn.old.cshtml
  16. +1 −1  OnPremise/WebSite/Views/Admin/Certificates.cshtml
  17. +1 −1  OnPremise/WebSite/Views/Shared/_Layout.cshtml
  18. +8 −0 OnPremise/WebSite/Web.Release.config
  19. +126 −135 OnPremise/WebSite/Web.config
  20. +303 −302 OnPremise/WebSite/WebSite.csproj
  21. BIN  OnPremise/WebSite/auth10idp-signing.pfx
  22. +12 −13 OnPremise/WebSite/packages.config
  23. BIN  libs/Microsoft.IdentityModel.dll
View
43 Azure/WebSite (WindowsAzure).Azure/ServiceConfiguration.cscfg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceConfiguration serviceName="WebSite__WindowsAzure_.Azure" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="2" osVersion="*">
+ <Role name="WebSite (WindowsAzure)">
+ <Instances count="1" />
+ <ConfigurationSettings>
+ <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+ <Setting name="StorageConnectionString" value="UseDevelopmentStorage=true" />
+ <Setting name="SiteName" value="Thinktecture IdentityServer RC (Azure Edition)" />
+ <Setting name="IssuerUri" value="http://identityserver.azure.thinktecture.com/trust/initial" />
+ <Setting name="IssuerContactEmail" value="identityserver@thinktecture.com" />
+ <Setting name="DefaultTokenType" value="urn:oasis:names:tc:SAML:2.0:assertion" />
+ <Setting name="DefaultTokenLifetime" value="10" />
+ <Setting name="MaximumTokenLifetime" value="24" />
+ <Setting name="SsoCookieLifetime" value="10" />
+ <Setting name="RequireSsl" value="true" />
+ <Setting name="RequireEncryption" value="false" />
+ <Setting name="EnableClientCertificates" value="true" />
+ <Setting name="EnableDelegation" value="true" />
+ <Setting name="AllowKnownRealmsOnly" value="true" />
+ <Setting name="AllowReplyTo" value="false" />
+ <Setting name="RequireReplyToWithinRealm" value="true" />
+ <Setting name="EnableStrongEpiForSsl" value="false" />
+ <Setting name="EnableFederationMessageTracing" value="false" />
+ <Setting name="EnforceUsersGroupMembership" value="true" />
+ <Setting name="RequireSignInConfirmation" value="true" />
+ <Setting name="Endpoints__WSFederation" value="true" />
+ <Setting name="Endpoints__FederationMetadata" value="true" />
+ <Setting name="Endpoints__WSTrustMessage" value="true" />
+ <Setting name="Endpoints__WSTrustMixed" value="true" />
+ <Setting name="Endpoints__SimpleHttp" value="true" />
+ <Setting name="Endpoints__OAuth2" value="true" />
+ <Setting name="Endpoints__WRAP" value="true" />
+ <Setting name="Endpoints__JSNotify" value="true" />
+ <Setting name="HttpPort" value="80" />
+ <Setting name="HttpsPort" value="443" />
+ <Setting name="SslCertificateDistinguishedName" value="" />
+ <Setting name="SigningCertificateDistinguishedName" value="" />
+ </ConfigurationSettings>
+ <Certificates>
+ <Certificate name="SSL" thumbprint="CD638612A35CD2F9232ECE36226B731FC666EF07" thumbprintAlgorithm="sha1" />
+ </Certificates>
+ </Role>
+</ServiceConfiguration>
View
14 Libraries/Thinktecture.IdentityServer.Core.Repositories/ConfigurationRepository.cs
@@ -14,7 +14,9 @@
using System.Security.Cryptography.X509Certificates;
using AutoMapper;
using Thinktecture.IdentityServer.Helper;
-using Thinktecture.IdentityServer.Models;
+using Thinktecture.IdentityServer.Models;
+using System;
+using System.IO;
namespace Thinktecture.IdentityServer.Repositories.Sql
{
@@ -161,7 +163,15 @@ protected virtual CertificateConfiguration LoadCertificateConfiguration(Certific
try
{
- certConfig.Certificate = X509Certificates.GetCertificateFromStore(StoreLocation.LocalMachine, StoreName.My, findType, findValue);
+ var certFileName = cert.SubjectDistinguishedName.Split('|')[0];
+ var certPassw0rd = cert.SubjectDistinguishedName.Split('|')[1];
+ var signignCert = new X509Certificate2(
+ Path.Combine(AppDomain.CurrentDomain.BaseDirectory, certFileName),
+ certPassw0rd,
+ X509KeyStorageFlags.PersistKeySet);
+
+ certConfig.Certificate = signignCert;
+ //certConfig.Certificate = X509Certificates.GetCertificateFromStore(StoreLocation.LocalMachine, StoreName.My, findType, findValue);
}
catch
{
View
187 ...ure.IdentityServer.Core.Repositories/Thinktecture.IdentityServer.Core.Repositories.csproj
@@ -1,99 +1,102 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{9658F86F-3059-4731-9EB0-5F67A4FF1A8A}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Thinktecture.IdentityServer.Core.Repositories</RootNamespace>
- <AssemblyName>Thinktecture.IdentityServer.Core.Repositories</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\build\Common\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>..\build\Common\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="AutoMapper">
- <HintPath>..\..\OnPremise\packages\AutoMapper.2.1.265\lib\net40\AutoMapper.dll</HintPath>
- </Reference>
- <Reference Include="EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\OnPremise\packages\EntityFramework.4.3.1\lib\net40\EntityFramework.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.Composition" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data.Entity" />
- <Reference Include="System.IdentityModel" />
- <Reference Include="System.Runtime.Caching" />
- <Reference Include="System.Web" />
- <Reference Include="System.Web.ApplicationServices" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="EntityModel\Certificates.cs" />
- <Compile Include="EntityModel\ClientCertificates.cs" />
- <Compile Include="ClientCertificatesRepository.cs" />
- <Compile Include="ConfigurationRepository.cs" />
- <Compile Include="EntityModel\Delegation.cs" />
- <Compile Include="DelegationRepository.cs" />
- <Compile Include="EntityModel\Endpoints.cs" />
- <Compile Include="Extensions.cs" />
- <Compile Include="EntityModel\Global.cs" />
- <Compile Include="IdentityServerConfigurationContext.cs" />
- <Compile Include="MemoryCacheRepository.cs" />
- <Compile Include="NullCacheRepository.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="ProviderUserRepository.cs" />
- <Compile Include="EntityModel\RelyingParties.cs" />
- <Compile Include="RelyingPartyRepository.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Thinktecture.IdentityServer.Core\Thinktecture.IdentityServer.Core.csproj">
- <Project>{38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}</Project>
- <Name>Thinktecture.IdentityServer.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="App.config" />
- <None Include="packages.config" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{9658F86F-3059-4731-9EB0-5F67A4FF1A8A}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Thinktecture.IdentityServer.Core.Repositories</RootNamespace>
+ <AssemblyName>Thinktecture.IdentityServer.Core.Repositories</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\build\Common\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <RunCodeAnalysis>false</RunCodeAnalysis>
+ <CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\build\Common\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="AutoMapper">
+ <HintPath>..\..\OnPremise\packages\AutoMapper.2.1.265\lib\net40\AutoMapper.dll</HintPath>
+ </Reference>
+ <Reference Include="EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\OnPremise\packages\EntityFramework.4.3.1\lib\net40\EntityFramework.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\libs\Microsoft.IdentityModel.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.ComponentModel.Composition" />
+ <Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Data.Entity" />
+ <Reference Include="System.IdentityModel" />
+ <Reference Include="System.Runtime.Caching" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Web.ApplicationServices" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="EntityModel\Certificates.cs" />
+ <Compile Include="EntityModel\ClientCertificates.cs" />
+ <Compile Include="ClientCertificatesRepository.cs" />
+ <Compile Include="ConfigurationRepository.cs" />
+ <Compile Include="EntityModel\Delegation.cs" />
+ <Compile Include="DelegationRepository.cs" />
+ <Compile Include="EntityModel\Endpoints.cs" />
+ <Compile Include="Extensions.cs" />
+ <Compile Include="EntityModel\Global.cs" />
+ <Compile Include="IdentityServerConfigurationContext.cs" />
+ <Compile Include="MemoryCacheRepository.cs" />
+ <Compile Include="NullCacheRepository.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="ProviderUserRepository.cs" />
+ <Compile Include="EntityModel\RelyingParties.cs" />
+ <Compile Include="RelyingPartyRepository.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Thinktecture.IdentityServer.Core\Thinktecture.IdentityServer.Core.csproj">
+ <Project>{38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}</Project>
+ <Name>Thinktecture.IdentityServer.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="App.config" />
+ <None Include="packages.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
- -->
+ -->
</Project>
View
48 Libraries/Thinktecture.IdentityServer.Core/Endpoints.cs
@@ -52,9 +52,9 @@ public static class Paths
/// Creates the URIs based on the host header
/// </summary>
/// <returns>STS Endpoints</returns>
- public static Endpoints Create(string host, string applicationPath, int httpPort, int httpsPort)
+ public static Endpoints Create(string scheme, string host, string applicationPath, int httpPort, int httpsPort)
{
- return Create("https://" + host + applicationPath, httpPort, httpsPort);
+ return Create(scheme, scheme + "://" + host + applicationPath, httpPort, httpsPort);
}
/// <summary>
@@ -62,7 +62,7 @@ public static Endpoints Create(string host, string applicationPath, int httpPort
/// </summary>
/// <param name="baseUri">The base URI.</param>
/// <returns>STS Endpoints</returns>
- public static Endpoints Create(string baseUriString, int httpPort, int httpsPort)
+ public static Endpoints Create(string scheme, string baseUriString, int httpPort, int httpsPort)
{
var ep = new Endpoints();
if (baseUriString.EndsWith("/"))
@@ -73,56 +73,56 @@ public static Endpoints Create(string baseUriString, int httpPort, int httpsPort
// construct various http and https URIs
var passive = new Uri(baseUriString + Paths.WSFedIssuePage);
var builder = new UriBuilder(passive);
- builder.Scheme = Uri.UriSchemeHttps;
- builder.Port = httpsPort;
+ builder.Scheme = scheme;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
ep.WSFederation = builder.Uri;
// construct various http and https URIs
var privacy = new Uri(baseUriString + Paths.PrivacyNotice);
- builder = new UriBuilder(privacy);
- builder.Scheme = Uri.UriSchemeHttps;
- builder.Port = httpsPort;
+ builder = new UriBuilder(privacy);
+ builder.Scheme = scheme;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
ep.PrivacyNotice = builder.Uri;
var simpleHttp = new Uri(baseUriString + Paths.SimpleHttp);
- builder = new UriBuilder(simpleHttp);
- builder.Scheme = Uri.UriSchemeHttps;
- builder.Port = httpsPort;
+ builder = new UriBuilder(simpleHttp);
+ builder.Scheme = scheme;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
ep.SimpleHttp = builder.Uri;
var wrap = new Uri(baseUriString + Paths.Wrap);
- builder = new UriBuilder(wrap);
- builder.Scheme = Uri.UriSchemeHttps;
- builder.Port = httpsPort;
+ builder = new UriBuilder(wrap);
+ builder.Scheme = scheme;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
ep.Wrap = builder.Uri;
var oauth2 = new Uri(baseUriString + Paths.OAuth2);
builder = new UriBuilder(oauth2);
- builder.Scheme = Uri.UriSchemeHttps;
- builder.Port = httpsPort;
+ builder.Scheme = scheme;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
ep.OAuth2 = builder.Uri;
var jsnotify = new Uri(baseUriString + Paths.JSNotify);
builder = new UriBuilder(jsnotify);
- builder.Scheme = Uri.UriSchemeHttps;
- builder.Port = httpsPort;
+ builder.Scheme = scheme;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
ep.JSNotify = builder.Uri;
var wsfedmd = new Uri(baseUriString + Paths.WSFedMetadata);
builder = new UriBuilder(wsfedmd);
- builder.Scheme = Uri.UriSchemeHttps;
- builder.Port = httpsPort;
+ builder.Scheme = scheme;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
ep.WSFederationMetadata = builder.Uri;
var activeClear = new Uri(baseUriString + Paths.WSTrustBase);
builder = new UriBuilder(activeClear);
- builder.Scheme = Uri.UriSchemeHttp;
- builder.Port = httpPort;
+ builder.Scheme = Uri.UriSchemeHttp;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
activeClear = builder.Uri;
builder = new UriBuilder(activeClear);
- builder.Scheme = Uri.UriSchemeHttps;
- builder.Port = httpsPort;
+ builder.Scheme = scheme;
+ builder.Port = scheme == Uri.UriSchemeHttps ? httpsPort : httpPort;
var activeSsl = builder.Uri;
ep.WSTrustMessageUserName = new Uri(activeClear + Paths.WSTrustMessageUserName);
View
287 Libraries/Thinktecture.IdentityServer.Core/Thinktecture.IdentityServer.Core.csproj
@@ -1,149 +1,152 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Thinktecture.IdentityServer</RootNamespace>
- <AssemblyName>Thinktecture.IdentityServer.Core</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\build\Common\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
- <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
- <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
- <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
- <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
- <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
- <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
- <CodeContractsBoundsObligations>False</CodeContractsBoundsObligations>
- <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
- <CodeContractsEnumObligations>False</CodeContractsEnumObligations>
- <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
- <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
- <CodeContractsShowSquigglies>False</CodeContractsShowSquigglies>
- <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
- <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
- <CodeContractsCustomRewriterAssembly />
- <CodeContractsCustomRewriterClass />
- <CodeContractsLibPaths />
- <CodeContractsExtraRewriteOptions />
- <CodeContractsExtraAnalysisOptions />
- <CodeContractsBaseLineFile />
- <CodeContractsCacheAnalysisResults>False</CodeContractsCacheAnalysisResults>
- <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
- <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>..\build\Common\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.Composition" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data.Entity" />
- <Reference Include="System.IdentityModel" />
- <Reference Include="System.Runtime.Caching" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Security" />
- <Reference Include="System.ServiceModel" />
- <Reference Include="System.ServiceModel.Activation" />
- <Reference Include="System.ServiceModel.Web" />
- <Reference Include="System.Web" />
- <Reference Include="System.Web.ApplicationServices" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- <Reference Include="Thinktecture.IdentityModel">
- <HintPath>..\..\OnPremise\packages\Thinktecture.IdentityModel.1.3.0.0\lib\Thinktecture.IdentityModel.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Configuration\RepositoryConfigurationSection.cs" />
- <Compile Include="Constants.cs" />
- <Compile Include="DateTimeEpochExtensions.cs" />
- <Compile Include="Helper\X509Certificates.cs" />
- <Compile Include="Models\CertificateConfiguration.cs" />
- <Compile Include="Models\ClientCertificate.cs" />
- <Compile Include="Models\DelegationSetting.cs" />
- <Compile Include="Models\EndpointConfiguration.cs" />
- <Compile Include="Models\GlobalConfiguration.cs" />
- <Compile Include="Endpoints.cs" />
- <Compile Include="Helper\Cache.cs" />
- <Compile Include="Repositories\IClientCertificatesRepository.cs" />
- <Compile Include="Repositories\ICacheRepository.cs" />
- <Compile Include="Repositories\IDelegationRepository.cs" />
- <Compile Include="SWT\SimpleWebToken.cs" />
- <Compile Include="SWT\SwtConstants.cs" />
- <Compile Include="SWT\SwtSecurityKeyClause.cs" />
- <Compile Include="SWT\SwtSecurityTokenHandler.cs" />
- <Compile Include="SWT\SymmetricSigningCredentials.cs" />
- <Compile Include="TokenService\GenericUserNameSecurityTokenHandler.cs" />
- <Compile Include="TokenService\SignInSessionsManager.cs" />
- <Compile Include="TokenService\ClientCertificateIssuerNameRegistry.cs" />
- <Compile Include="TokenService\RepositoryX509SecurityTokenHandler.cs" />
- <Compile Include="TokenService\RepositoryUserNameSecurityTokenHandler.cs" />
- <Compile Include="TokenService\WSFederationMetadataGenerator.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Repositories\Container.cs" />
- <Compile Include="Repositories\IConfigurationRepository.cs" />
- <Compile Include="Repositories\IRelyingPartyRepository.cs" />
- <Compile Include="Repositories\IUserRepository.cs" />
- <Compile Include="Models\RelyingParty.cs" />
- <Compile Include="Repositories\RepositoryExportProvider.cs" />
- <Compile Include="TokenService\Request.cs" />
- <Compile Include="TokenService\RequestDetailsScope.cs" />
- <Compile Include="TokenService\RequestDetails.cs" />
- <Compile Include="TokenService\TokenService.cs" />
- <Compile Include="TokenService\TokenServiceConfiguration.cs" />
- <Compile Include="TokenService\TokenServiceHostFactory.cs" />
- <Compile Include="TokenService\X509CertificateSessionSecurityTokenHandler.cs" />
- <Compile Include="Tracing\Tracing.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Thinktecture.IdentityServer</RootNamespace>
+ <AssemblyName>Thinktecture.IdentityServer.Core</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <SccProjectName>
+ </SccProjectName>
+ <SccLocalPath>
+ </SccLocalPath>
+ <SccAuxPath>
+ </SccAuxPath>
+ <SccProvider>
+ </SccProvider>
+ <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\build\Common\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
+ <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
+ <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
+ <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
+ <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
+ <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
+ <CodeContractsNonNullObligations>False</CodeContractsNonNullObligations>
+ <CodeContractsBoundsObligations>False</CodeContractsBoundsObligations>
+ <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
+ <CodeContractsEnumObligations>False</CodeContractsEnumObligations>
+ <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
+ <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
+ <CodeContractsShowSquigglies>False</CodeContractsShowSquigglies>
+ <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
+ <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
+ <CodeContractsCustomRewriterAssembly />
+ <CodeContractsCustomRewriterClass />
+ <CodeContractsLibPaths />
+ <CodeContractsExtraRewriteOptions />
+ <CodeContractsExtraAnalysisOptions />
+ <CodeContractsBaseLineFile />
+ <CodeContractsCacheAnalysisResults>False</CodeContractsCacheAnalysisResults>
+ <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
+ <CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
+ <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\build\Common\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\libs\Microsoft.IdentityModel.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.ComponentModel.Composition" />
+ <Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Data.Entity" />
+ <Reference Include="System.IdentityModel" />
+ <Reference Include="System.Runtime.Caching" />
+ <Reference Include="System.Runtime.Serialization" />
+ <Reference Include="System.Security" />
+ <Reference Include="System.ServiceModel" />
+ <Reference Include="System.ServiceModel.Activation" />
+ <Reference Include="System.ServiceModel.Web" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Web.ApplicationServices" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Thinktecture.IdentityModel">
+ <HintPath>..\..\OnPremise\packages\Thinktecture.IdentityModel.1.3.0.0\lib\Thinktecture.IdentityModel.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Configuration\RepositoryConfigurationSection.cs" />
+ <Compile Include="Constants.cs" />
+ <Compile Include="DateTimeEpochExtensions.cs" />
+ <Compile Include="Helper\X509Certificates.cs" />
+ <Compile Include="Models\CertificateConfiguration.cs" />
+ <Compile Include="Models\ClientCertificate.cs" />
+ <Compile Include="Models\DelegationSetting.cs" />
+ <Compile Include="Models\EndpointConfiguration.cs" />
+ <Compile Include="Models\GlobalConfiguration.cs" />
+ <Compile Include="Endpoints.cs" />
+ <Compile Include="Helper\Cache.cs" />
+ <Compile Include="Repositories\IClientCertificatesRepository.cs" />
+ <Compile Include="Repositories\ICacheRepository.cs" />
+ <Compile Include="Repositories\IDelegationRepository.cs" />
+ <Compile Include="SWT\SimpleWebToken.cs" />
+ <Compile Include="SWT\SwtConstants.cs" />
+ <Compile Include="SWT\SwtSecurityKeyClause.cs" />
+ <Compile Include="SWT\SwtSecurityTokenHandler.cs" />
+ <Compile Include="SWT\SymmetricSigningCredentials.cs" />
+ <Compile Include="TokenService\GenericUserNameSecurityTokenHandler.cs" />
+ <Compile Include="TokenService\SignInSessionsManager.cs" />
+ <Compile Include="TokenService\ClientCertificateIssuerNameRegistry.cs" />
+ <Compile Include="TokenService\RepositoryX509SecurityTokenHandler.cs" />
+ <Compile Include="TokenService\RepositoryUserNameSecurityTokenHandler.cs" />
+ <Compile Include="TokenService\WSFederationMetadataGenerator.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Repositories\Container.cs" />
+ <Compile Include="Repositories\IConfigurationRepository.cs" />
+ <Compile Include="Repositories\IRelyingPartyRepository.cs" />
+ <Compile Include="Repositories\IUserRepository.cs" />
+ <Compile Include="Models\RelyingParty.cs" />
+ <Compile Include="Repositories\RepositoryExportProvider.cs" />
+ <Compile Include="TokenService\Request.cs" />
+ <Compile Include="TokenService\RequestDetailsScope.cs" />
+ <Compile Include="TokenService\RequestDetails.cs" />
+ <Compile Include="TokenService\TokenService.cs" />
+ <Compile Include="TokenService\TokenServiceConfiguration.cs" />
+ <Compile Include="TokenService\TokenServiceHostFactory.cs" />
+ <Compile Include="TokenService\X509CertificateSessionSecurityTokenHandler.cs" />
+ <Compile Include="Tracing\Tracing.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
- -->
+ -->
</Project>
View
1  Libraries/Thinktecture.IdentityServer.Web.Library/Controller/FederationMetadataController.cs
@@ -42,6 +42,7 @@ public ActionResult Generate()
return Cache.ReturnFromCache<ActionResult>(CacheRepository, Constants.CacheKeys.WSFedMetadata, 1, () =>
{
var endpoints = Endpoints.Create(
+ HttpContext.Request.Url.Scheme,
HttpContext.Request.Headers["Host"],
HttpContext.Request.ApplicationPath,
ConfigurationRepository.Endpoints.HttpPort,
View
1  Libraries/Thinktecture.IdentityServer.Web.Library/Controller/HomeController.cs
@@ -37,6 +37,7 @@ public ActionResult Index()
public ActionResult AppIntegration()
{
var endpoints = Endpoints.Create(
+ HttpContext.Request.Url.Scheme,
HttpContext.Request.Headers["Host"],
HttpContext.Request.ApplicationPath,
ConfigurationRepository.Endpoints.HttpPort,
View
237 ...es/Thinktecture.IdentityServer.Web.Library/Thinktecture.IdentityServer.Web.Library.csproj
@@ -1,124 +1,127 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{FC2D7E2A-65A2-480F-AAE8-855FD026AF85}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Thinktecture.IdentityServer.Web</RootNamespace>
- <AssemblyName>Thinktecture.IdentityServer.Web.Library</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\build\Common\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>..\build\Common\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="AutoMapper, Version=2.1.265.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
- <HintPath>..\..\OnPremise\packages\AutoMapper.2.1.265\lib\net40\AutoMapper.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
- <Reference Include="System" />
- <Reference Include="System.ComponentModel.Composition" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Core" />
- <Reference Include="System.IdentityModel" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.ServiceModel" />
- <Reference Include="System.Web" />
- <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- <Reference Include="Thinktecture.IdentityModel">
- <HintPath>..\packages\Thinktecture.IdentityModel.1.3.0.0\lib\Thinktecture.IdentityModel.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="ActionResults\AccessTokenResponse.cs" />
- <Compile Include="ActionResults\JSNotifyResult.cs" />
- <Compile Include="ActionResults\OAuth2AccessTokenResult.cs" />
- <Compile Include="ActionResults\SimpleHttpResult.cs" />
- <Compile Include="ActionResults\UnauthorizedResult.cs" />
- <Compile Include="ActionResults\WrapResult.cs" />
- <Compile Include="ActionResults\WSFederationResult.cs" />
- <Compile Include="Controller\AccountController.cs" />
- <Compile Include="Controller\Admin\AdminController.cs" />
- <Compile Include="Controller\Admin\ClientCertificatesAdminController.cs" />
- <Compile Include="Controller\Admin\DelegationAdminController.cs" />
- <Compile Include="Controller\Admin\RelyingPartiesAdminController.cs" />
- <Compile Include="Controller\FederationMetadataController.cs" />
- <Compile Include="Controller\HomeController.cs" />
- <Compile Include="Controller\InitialConfigurationController.cs" />
- <Compile Include="Controller\Issue\JSNotifyController.cs" />
- <Compile Include="Controller\Issue\OAuth2Controller.cs" />
- <Compile Include="Controller\Issue\SimpleHttpController.cs" />
- <Compile Include="Controller\Issue\WrapController.cs" />
- <Compile Include="Controller\Issue\WSFederationController.cs" />
- <Compile Include="GlobalFilter\GlobalViewModelFilter.cs" />
- <Compile Include="GlobalFilter\InitialConfigurationFilter.cs" />
- <Compile Include="GlobalFilter\SslRedirectFilter.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Security\AuthenticationHelper.cs" />
- <Compile Include="Security\AuthorizationManager.cs" />
- <Compile Include="Security\ClaimsAuthorizeAttribute.cs" />
- <Compile Include="Security\ClaimsTransformer.cs" />
- <Compile Include="Security\OAuth2\ResourceOwnerCredentialRequest.cs" />
- <Compile Include="Security\TokenResponse.cs" />
- <Compile Include="ViewModels\Administration\AddClientCertificateModel.cs" />
- <Compile Include="ViewModels\Administration\AddDelegationModel.cs" />
- <Compile Include="ViewModels\Administration\EditCertificatesModel.cs" />
- <Compile Include="ViewModels\Administration\EditClientCertificatesModel.cs" />
- <Compile Include="ViewModels\Administration\EditDelegationModel.cs" />
- <Compile Include="ViewModels\Administration\EndpointConfigurationModel.cs" />
- <Compile Include="ViewModels\Administration\Extensions.cs" />
- <Compile Include="ViewModels\Administration\GlobalConfigurationModel.cs" />
- <Compile Include="ViewModels\Administration\MyModel.cs" />
- <Compile Include="ViewModels\Administration\RelyingPartiesModel.cs" />
- <Compile Include="ViewModels\Administration\RelyingPartyModel.cs" />
- <Compile Include="ViewModels\InitialConfigurationModel.cs" />
- <Compile Include="ViewModels\SignInModel.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Thinktecture.IdentityServer.Core\Thinktecture.IdentityServer.Core.csproj">
- <Project>{38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}</Project>
- <Name>Thinktecture.IdentityServer.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\jsnotify.htm" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{FC2D7E2A-65A2-480F-AAE8-855FD026AF85}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Thinktecture.IdentityServer.Web</RootNamespace>
+ <AssemblyName>Thinktecture.IdentityServer.Web.Library</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\build\Common\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\build\Common\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="AutoMapper, Version=2.1.265.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+ <HintPath>..\..\OnPremise\packages\AutoMapper.2.1.265\lib\net40\AutoMapper.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\libs\Microsoft.IdentityModel.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.ComponentModel.Composition" />
+ <Reference Include="System.ComponentModel.DataAnnotations" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.IdentityModel" />
+ <Reference Include="System.Runtime.Serialization" />
+ <Reference Include="System.ServiceModel" />
+ <Reference Include="System.Web" />
+ <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Thinktecture.IdentityModel">
+ <HintPath>..\packages\Thinktecture.IdentityModel.1.3.0.0\lib\Thinktecture.IdentityModel.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="ActionResults\AccessTokenResponse.cs" />
+ <Compile Include="ActionResults\JSNotifyResult.cs" />
+ <Compile Include="ActionResults\OAuth2AccessTokenResult.cs" />
+ <Compile Include="ActionResults\SimpleHttpResult.cs" />
+ <Compile Include="ActionResults\UnauthorizedResult.cs" />
+ <Compile Include="ActionResults\WrapResult.cs" />
+ <Compile Include="ActionResults\WSFederationResult.cs" />
+ <Compile Include="Controller\AccountController.cs" />
+ <Compile Include="Controller\Admin\AdminController.cs" />
+ <Compile Include="Controller\Admin\ClientCertificatesAdminController.cs" />
+ <Compile Include="Controller\Admin\DelegationAdminController.cs" />
+ <Compile Include="Controller\Admin\RelyingPartiesAdminController.cs" />
+ <Compile Include="Controller\FederationMetadataController.cs" />
+ <Compile Include="Controller\HomeController.cs" />
+ <Compile Include="Controller\InitialConfigurationController.cs" />
+ <Compile Include="Controller\Issue\JSNotifyController.cs" />
+ <Compile Include="Controller\Issue\OAuth2Controller.cs" />
+ <Compile Include="Controller\Issue\SimpleHttpController.cs" />
+ <Compile Include="Controller\Issue\WrapController.cs" />
+ <Compile Include="Controller\Issue\WSFederationController.cs" />
+ <Compile Include="GlobalFilter\GlobalViewModelFilter.cs" />
+ <Compile Include="GlobalFilter\InitialConfigurationFilter.cs" />
+ <Compile Include="GlobalFilter\SslRedirectFilter.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Security\AuthenticationHelper.cs" />
+ <Compile Include="Security\AuthorizationManager.cs" />
+ <Compile Include="Security\ClaimsAuthorizeAttribute.cs" />
+ <Compile Include="Security\ClaimsTransformer.cs" />
+ <Compile Include="Security\OAuth2\ResourceOwnerCredentialRequest.cs" />
+ <Compile Include="Security\TokenResponse.cs" />
+ <Compile Include="ViewModels\Administration\AddClientCertificateModel.cs" />
+ <Compile Include="ViewModels\Administration\AddDelegationModel.cs" />
+ <Compile Include="ViewModels\Administration\EditCertificatesModel.cs" />
+ <Compile Include="ViewModels\Administration\EditClientCertificatesModel.cs" />
+ <Compile Include="ViewModels\Administration\EditDelegationModel.cs" />
+ <Compile Include="ViewModels\Administration\EndpointConfigurationModel.cs" />
+ <Compile Include="ViewModels\Administration\Extensions.cs" />
+ <Compile Include="ViewModels\Administration\GlobalConfigurationModel.cs" />
+ <Compile Include="ViewModels\Administration\MyModel.cs" />
+ <Compile Include="ViewModels\Administration\RelyingPartiesModel.cs" />
+ <Compile Include="ViewModels\Administration\RelyingPartyModel.cs" />
+ <Compile Include="ViewModels\InitialConfigurationModel.cs" />
+ <Compile Include="ViewModels\SignInModel.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Thinktecture.IdentityServer.Core\Thinktecture.IdentityServer.Core.csproj">
+ <Project>{38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}</Project>
+ <Name>Thinktecture.IdentityServer.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\jsnotify.htm" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
- -->
+ -->
</Project>
View
183 OnPremise/Thinktecture.IdentityServer.sln → OnPremise/AppHarbor.sln
@@ -1,98 +1,85 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSite", "WebSite\WebSite.csproj", "{B9C90A36-86C0-4974-B0B4-3524F508D847}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.IdentityServer.Core", "..\Libraries\Thinktecture.IdentityServer.Core\Thinktecture.IdentityServer.Core.csproj", "{38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{052789EB-BFB0-48B7-A5D2-F890FF3608CA}"
- ProjectSection(SolutionItems) = preProject
- Local.testsettings = Local.testsettings
- Thinktecture.IdentityServer.vsmdi = Thinktecture.IdentityServer.vsmdi
- TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.IdentityServer.Core.Repositories", "..\Libraries\Thinktecture.IdentityServer.Core.Repositories\Thinktecture.IdentityServer.Core.Repositories.csproj", "{9658F86F-3059-4731-9EB0-5F67A4FF1A8A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.IdentityServer.Web.Library", "..\Libraries\Thinktecture.IdentityServer.Web.Library\Thinktecture.IdentityServer.Web.Library.csproj", "{FC2D7E2A-65A2-480F-AAE8-855FD026AF85}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libaries", "Libaries", "{2C19FF9A-AD66-4483-A787-05F22BB8B5EA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "..\Tests\Tests.csproj", "{7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{37144EFB-AB32-4CCA-B6B4-F0494D00681B}"
-EndProject
-Global
- GlobalSection(TestCaseManagementSettings) = postSolution
- CategoryFile = Thinktecture.IdentityServer.vsmdi
- EndGlobalSection
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|Any CPU.Build.0 = Release|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|x86.ActiveCfg = Release|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|x86.ActiveCfg = Debug|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|Any CPU.Build.0 = Release|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|x86.ActiveCfg = Release|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|x86.ActiveCfg = Debug|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|Any CPU.Build.0 = Release|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|x86.ActiveCfg = Release|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|Any CPU.Build.0 = Release|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|x86.ActiveCfg = Release|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Release|Any CPU.Build.0 = Release|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF}.Release|x86.ActiveCfg = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {9658F86F-3059-4731-9EB0-5F67A4FF1A8A} = {2C19FF9A-AD66-4483-A787-05F22BB8B5EA}
- {FC2D7E2A-65A2-480F-AAE8-855FD026AF85} = {2C19FF9A-AD66-4483-A787-05F22BB8B5EA}
- {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A} = {2C19FF9A-AD66-4483-A787-05F22BB8B5EA}
- {7392F6F9-9723-4E1F-A0C4-7F6340E5CAAF} = {37144EFB-AB32-4CCA-B6B4-F0494D00681B}
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSite", "WebSite\WebSite.csproj", "{B9C90A36-86C0-4974-B0B4-3524F508D847}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.IdentityServer.Core", "..\Libraries\Thinktecture.IdentityServer.Core\Thinktecture.IdentityServer.Core.csproj", "{38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{052789EB-BFB0-48B7-A5D2-F890FF3608CA}"
+ ProjectSection(SolutionItems) = preProject
+ Local.testsettings = Local.testsettings
+ Thinktecture.IdentityServer.vsmdi = Thinktecture.IdentityServer.vsmdi
+ TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.IdentityServer.Core.Repositories", "..\Libraries\Thinktecture.IdentityServer.Core.Repositories\Thinktecture.IdentityServer.Core.Repositories.csproj", "{9658F86F-3059-4731-9EB0-5F67A4FF1A8A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.IdentityServer.Web.Library", "..\Libraries\Thinktecture.IdentityServer.Web.Library\Thinktecture.IdentityServer.Web.Library.csproj", "{FC2D7E2A-65A2-480F-AAE8-855FD026AF85}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libaries", "Libaries", "{2C19FF9A-AD66-4483-A787-05F22BB8B5EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{37144EFB-AB32-4CCA-B6B4-F0494D00681B}"
+EndProject
+Global
+ GlobalSection(TestCaseManagementSettings) = postSolution
+ CategoryFile = Thinktecture.IdentityServer.vsmdi
+ EndGlobalSection
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {B9C90A36-86C0-4974-B0B4-3524F508D847}.Release|x86.ActiveCfg = Release|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A}.Release|x86.ActiveCfg = Release|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A}.Release|x86.ActiveCfg = Release|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85}.Release|x86.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {9658F86F-3059-4731-9EB0-5F67A4FF1A8A} = {2C19FF9A-AD66-4483-A787-05F22BB8B5EA}
+ {FC2D7E2A-65A2-480F-AAE8-855FD026AF85} = {2C19FF9A-AD66-4483-A787-05F22BB8B5EA}
+ {38CE5C59-909E-4DA6-8E1D-7EEE7312CA9A} = {2C19FF9A-AD66-4483-A787-05F22BB8B5EA}
+ EndGlobalSection
+EndGlobal
View
BIN  OnPremise/WebSite/App_Data/IdentityServerConfiguration.sdf
Binary file not shown
View
8 OnPremise/WebSite/Configuration/connectionStrings.release.config
@@ -0,0 +1,8 @@
+<connectionStrings>
+ <add name="ProviderDB"
+ connectionString="data source=.\sqlexpress;Integrated Security=SSPI;Initial Catalog=aspnetdb;MultipleActiveResultSets=True"
+ providerName="System.Data.SqlClient" />
+ <add name="IdentityServerConfiguration"
+ connectionString="Data Source=|DataDirectory|\IdentityServerConfiguration.sdf"
+ providerName="System.Data.EntityClient" />
+</connectionStrings>
View
2  OnPremise/WebSite/Configuration/wif.config
@@ -35,7 +35,7 @@
</securityTokenHandlers>
<federatedAuthentication>
- <cookieHandler name="idsrvauth" />
+ <cookieHandler name="idsrvauth" requireSsl="false" />
</federatedAuthentication>
</service>
</microsoft.identityModel>
View
2  OnPremise/WebSite/Global.asax.cs
@@ -48,7 +48,7 @@ public static void RegisterGlobalFilters(GlobalFilterCollection filters)
{
filters.Add(new HandleErrorAttribute());
filters.Add(new GlobalViewModelFilter());
- filters.Add(new SslRedirectFilter());
+ //filters.Add(new SslRedirectFilter());
filters.Add(new InitialConfigurationFilter());
}
View
270 OnPremise/WebSite/Views/Account/SignIn.cshtml
@@ -1,65 +1,205 @@
-@model Thinktecture.IdentityServer.Web.ViewModels.SignInModel
-
-@{
- ViewBag.Title = "Username / Password Sign In";
- ViewBag.Meta = "<meta name=\"viewport\" content=\"width=320\" />";
-}
-
-<h2>Username / Password Sign In</h2>
-
-@Html.ValidationSummary(true, "Sign In was unsuccessful. Please correct the errors and try again.")
-
-@using (Html.BeginForm())
-{
- <div>
- <fieldset>
- <legend>Account Information</legend>
-
- <div class="editor-label">
- @Html.LabelFor(m => m.UserName)
- </div>
- <div class="editor-field-slim">
- @Html.TextBoxFor(m => m.UserName)
- @Html.ValidationMessageFor(m => m.UserName)
- </div>
-
- <div class="editor-label">
- @Html.LabelFor(m => m.Password)
- </div>
- <div class="editor-field-slim">
- @Html.PasswordFor(m => m.Password)
- @Html.ValidationMessageFor(m => m.Password)
- </div>
-
- <div class="editor-label">
- @Html.CheckBoxFor(m => m.EnableSSO)
- @Html.LabelFor(m => m.EnableSSO)
- </div>
-
- <p>
- <input type="submit" value="Sign In" />
- </p>
- </fieldset>
-
- <br />
-
- @if ((ViewBag.ShowClientCertificateLink != null) && (ViewBag.ShowClientCertificateLink))
- {
- @Html.ActionLink("Use client certificate", "CertificateSignIn", new { returnUrl = ViewBag.ReturnUrl })
- }
- </div>
-}
-
-@if (false)
-{
- <script src="../../Scripts/jquery-1.6.4.js" type="text/javascript" />
-}
-
-<script type="text/javascript">
- $(function () {
-
- $("#UserName").focus();
-
- });
-
-</script>
+@model Thinktecture.IdentityServer.Web.ViewModels.SignInModel
+
+@{
+ Layout = null;
+}
+
+<!DOCTYPE html>
+<html lang="es"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=320" />
+<title>Login Form</title>
+<style type="text/css">
+* {
+outline: none;
+}
+
+a {
+color: #00A5F0;
+text-decoration: none;
+-webkit-transition: color .2s linear;
+-moz-transition: color .2s linear;
+}
+
+a:hover {
+color: #24BBFF;
+}
+
+::selection {
+background: #E92C6C;
+color: white;
+text-shadow: 0 1px rgba(0, 0, 0, .2);
+}
+
+::-moz-selection {
+background: #E92C6C;
+color: white;
+text-shadow: 0 1px rgba(0, 0, 0, .2);
+}
+
+::-o-selection {
+background: #E92C6C;
+color: white;
+text-shadow: 0 1px rgba(0, 0, 0, .2);
+}
+
+body#login-page {
+min-width: 600px;
+}
+
+body {
+margin: 0;
+background-color: #DDD;
+color: #222;
+font: 11px "Helvetica Neue",Helvetica,Arial,sans-serif;
+min-width: 1080px;
+}
+
+.validation-summary-errors
+{
+color: white;
+text-align: center;
+width: 300px;
+padding: 10px 0 0;
+margin: 0 auto;
+margin-top: 20px;
+border: 1px solid #eee;
+background-color: black;
+border-radius: 5px;
+-webkit-border-radius: 5px;
+-moz-border-radius: 5px;
+font-size: 12px;
+}
+
+.validation-summary-errors ul
+{
+ list-style-type: none
+}
+
+.login-wrap .mensaje {
+text-shadow: 0 1px 0 #EEE;
+color: #222;
+text-align: center;
+width: 600px;
+padding: 15px 0 0;
+margin: 0 auto;
+margin-top: 110px;
+}
+
+.login-wrap h2 {
+font-size: 28px;
+margin: 0;
+}
+
+form#form-logeo {
+width: 280px;
+margin: 15px auto;
+padding-top: 30px;
+}
+
+form.generic .field {
+margin-bottom: 10px;
+}
+
+form.generic label {
+display: block;
+font-weight: bold;
+font-size: 12px;
+color: #212121;
+text-shadow: 0 1px 0 #EEE;
+margin-bottom: 8px;
+}
+
+form#form-logeo input.text {
+width: 258px;
+}
+
+form.generic input.text {
+font-size: 14px;
+border-color: #DDD;
+-webkit-transition: border-color .2s linear;
+-moz-transition: border-color .2s linear;
+border: 1px solid #BBB;
+border-radius: 5px;
+-webkit-border-radius: 5px;
+-moz-border-radius: 5px;
+box-shadow: 0 1px 0 #eee;
+-webkit-box-shadow: 0 1px 0 #eee;
+-moz-box-shadow: 0 1px 0 #eee;
+display: block;
+width: auto;
+border-image: initial;
+}
+
+form input.text, form input.search, .contact-wrapper textarea {
+padding: 10px;
+margin: 0;
+font: 14px "HelveticaNeue", Helvetica, Arial, sans-serif;
+}
+
+form.generic label span {
+color: #878787;
+font-weight: normal;
+}
+
+form.generic .btnlogeo {
+overflow: hidden;
+}
+
+form.generic #login-submit {
+height: 36px;
+width: 280px;
+padding: 0 0 1px;
+}
+
+form.generic a.button, form.generic #login-submit {
+cursor: pointer;
+display: block;
+line-height: 34px;
+padding: 0 20px;
+font-size: 12px;
+font-weight: bold;
+font-family: inherit;
+background-color: #00A5F0;
+color: white;
+border-radius: 5px;
+-webkit-border-radius: 5px;
+-moz-border-radius: 5px;
+border: 1px solid rgba(0, 0, 0, .2);
+box-shadow: 0 0 0 1px rgba(255, 255, 255, .4) inset, 0 1px #fff;
+-moz-box-shadow: 0 0 0 1px rgba(255, 255, 255, .4) inset, 0 1px #fff;
+-webkit-box-shadow: 0 0 0 1px rgba(255, 255, 255, .4) inset, 0 1px #fff;
+text-shadow: 0 -1px rgba(0, 0, 0, .2);
+text-align: center;
+border-image: initial;
+}
+</style>
+
+</head>
+
+<body id="login-page">
+<div class="login-wrap">
+<div class="mensaje">
+<h2>Contoso Login</h2>
+</div>
+@Html.ValidationSummary(true)
+
+@using (Html.BeginForm())
+{
+<div id="login-user" class="field">
+<label>Username</label>
+<input id="login-username" type="text" class="text" name="username" placeholder="enter your username" tabindex="1" maxlength="200">
+@Html.ValidationMessageFor(m => m.UserName)
+</div>
+
+<div id="login-pass" class="field">
+<label>Password<span><a href="#"></label>
+<input id="login-password" type="password" class="text" name="password" placeholder="enter your password" tabindex="3" maxlength="32">
+@Html.ValidationMessageFor(m => m.Password)
+</div>
+<div class="btnlogeo">
+<input id="login-submit" type="submit" value="Sign in">
+</div>
+}
+</div>
+</body></html>
View
65 OnPremise/WebSite/Views/Account/SignIn.old.cshtml
@@ -0,0 +1,65 @@
+@model Thinktecture.IdentityServer.Web.ViewModels.SignInModel
+
+@{
+ ViewBag.Title = "Username / Password Sign In";
+ ViewBag.Meta = "<meta name=\"viewport\" content=\"width=320\" />";
+}
+
+<h2>Username / Password Sign In</h2>
+
+@Html.ValidationSummary(true, "Sign In was unsuccessful. Please correct the errors and try again.")
+
+@using (Html.BeginForm())
+{
+ <div>
+ <fieldset>
+ <legend>Account Information</legend>
+
+ <div class="editor-label">
+ @Html.LabelFor(m => m.UserName)
+ </div>
+ <div class="editor-field-slim">
+ @Html.TextBoxFor(m => m.UserName)
+ @Html.ValidationMessageFor(m => m.UserName)
+ </div>
+
+ <div class="editor-label">
+ @Html.LabelFor(m => m.Password)
+ </div>
+ <div class="editor-field-slim">
+ @Html.PasswordFor(m => m.Password)
+ @Html.ValidationMessageFor(m => m.Password)
+ </div>
+
+ <div class="editor-label">
+ @Html.CheckBoxFor(m => m.EnableSSO)
+ @Html.LabelFor(m => m.EnableSSO)
+ </div>
+
+ <p>
+ <input type="submit" value="Sign In" />
+ </p>
+ </fieldset>
+
+ <br />
+
+ @if ((ViewBag.ShowClientCertificateLink != null) && (ViewBag.ShowClientCertificateLink))
+ {
+ @Html.ActionLink("Use client certificate", "CertificateSignIn", new { returnUrl = ViewBag.ReturnUrl })
+ }
+ </div>
+}
+
+@if (false)
+{
+ <script src="../../Scripts/jquery-1.7.1.js" type="text/javascript" />
+}
+
+<script type="text/javascript">
+ $(function () {
+
+ $("#UserName").focus();
+
+ });
+
+</script>
View
2  OnPremise/WebSite/Views/Admin/Certificates.cshtml
@@ -66,7 +66,7 @@
@if (false)
{
- <script src="../../Scripts/jquery-1.6.4.js" type="text/javascript" />
+ <script src="../../Scripts/jquery-1.7.1.js" type="text/javascript" />
}
<script type="text/javascript">
View
2  OnPremise/WebSite/Views/Shared/_Layout.cshtml
@@ -3,7 +3,7 @@
<head>
<title>@ViewBag.Title</title>
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
- <script src="@Url.Content("~/Scripts/jquery-1.6.4.min.js")" type="text/javascript"></script>
+ <script src="@Url.Content("~/Scripts/jquery-1.7.1.min.js")" type="text/javascript"></script>
@Html.Raw(ViewBag.Meta)
</head>
View
8 OnPremise/WebSite/Web.Release.config
@@ -3,6 +3,14 @@
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+ <connectionStrings>
+ <add name="ProviderDB"
+ connectionString="Server=4aa1dc2b-2143-4617-b4d1-a060004521c1.sqlserver.sequelizer.com;Database=db4aa1dc2b21434617b4d1a060004521c1;User ID=afbnehmiepsuqnvz;Password=vZ4VLXxgxhn3tDvvyqyfpN6YkKa7zzS4rpQrjLujX5hddJaNqvwxhUNP4dKbWyP7;"
+ xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+ <add name="IdentityServerConfiguration"
+ connectionString="Server=4aa1dc2b-2143-4617-b4d1-a060004521c1.sqlserver.sequelizer.com;Database=db4aa1dc2b21434617b4d1a060004521c1;User ID=afbnehmiepsuqnvz;Password=vZ4VLXxgxhn3tDvvyqyfpN6YkKa7zzS4rpQrjLujX5hddJaNqvwxhUNP4dKbWyP7;"
+ xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+ </connectionStrings>
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
View
261 OnPremise/WebSite/Web.config
@@ -1,136 +1,127 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <configSections>
- <section name="microsoft.identityModel" type="Microsoft.IdentityModel.Configuration.MicrosoftIdentityModelSection, Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
- <section name="thinktecture.identityServer.repositories" type="Thinktecture.IdentityServer.Configuration.RepositoryConfigurationSection, Thinktecture.IdentityServer.Core" />
- <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- </configSections>
- <!-- ............................................... -->
- <!-- start of identity server relevant configuration -->
- <thinktecture.identityServer.repositories configSource="configuration\repositories.config" />
- <microsoft.identityModel configSource="configuration\wif.config" />
- <connectionStrings configSource="configuration\connectionStrings.config" />
- <!--<system.diagnostics configSource="configuration\tracing.config" />-->
- <location path="account/certificatesignin">
- <system.webServer>
- <security>
- <access sslFlags="Ssl, SslNegotiateCert, SslRequireCert" />
- </security>
- </system.webServer>
- </location>
- <location path="issue/simple">
- <system.webServer>
- <security>
- <access sslFlags="SslNegotiateCert" />
- </security>
- </system.webServer>
- </location>
- <location path="issue/oauth2">
- <system.webServer>
- <security>
- <access sslFlags="SslNegotiateCert" />
- </security>
- </system.webServer>
- </location>
- <system.serviceModel>
- <diagnostics>
- <messageLogging logMessagesAtTransportLevel="true" logEntireMessage="true" logMalformedMessages="true" />
- </diagnostics>
- </system.serviceModel>
- <!-- end of identity server relevant configuration -->
- <!-- ............................................. -->
- <appSettings>
- <add key="ClientValidationEnabled" value="true" />
- <add key="UnobtrusiveJavaScriptEnabled" value="true" />
- <add key="RouteDebugger:Enabled" value="false" />
- <add key="UseSqlServerForConfiguration" value="false" />
- </appSettings>
- <system.web>
- <customErrors mode="RemoteOnly" />
- <compilation debug="true" targetFramework="4.0">
- <assemblies>
- <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
- <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
- <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
- <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
- <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
- <add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <add assembly="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
- </assemblies>
- </compilation>
- <authentication mode="None" />
- <pages>
- <namespaces>
- <add namespace="System.Web.Helpers" />
- <add namespace="System.Web.Mvc" />
- <add namespace="System.Web.Mvc.Ajax" />
- <add namespace="System.Web.Mvc.Html" />
- <add namespace="System.Web.Routing" />
- <add namespace="System.Web.WebPages" />
- </namespaces>
- </pages>
- <!-- default membership provider -->
- <membership defaultProvider="Membership">
- <providers>
- <clear />
- <add name="Membership" type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="ProviderDB" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true" applicationName="/" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="7" minRequiredNonalphanumericCharacters="1" passwordAttemptWindow="10" passwordStrengthRegularExpression="" />
- <!-- uncomment if you want to use the universal provider -->
- <!--<add name="Membership"
- type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
- connectionStringName="ProviderDB"
- enablePasswordRetrieval="false"
- enablePasswordReset="true"
- requiresQuestionAndAnswer="false"
- requiresUniqueEmail="false"
- maxInvalidPasswordAttempts="5"
- minRequiredPasswordLength="6"
- minRequiredNonalphanumericCharacters="0"
- passwordAttemptWindow="10"
- applicationName="/" />-->
- </providers>
- </membership>
- <roleManager enabled="true" defaultProvider="Roles">
- <providers>
- <clear />
- <add name="Roles" type="System.Web.Security.SqlRoleProvider" connectionStringName="ProviderDB" applicationName="/" />
- <!-- uncomment if you want to use the universal provider -->
- <!--<add name="Roles"
- type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
- connectionStringName="ProviderDB"
- applicationName="/" />-->
- </providers>
- </roleManager>
- <!--<profile configSource="configuration\profile.config" />-->
- </system.web>
- <system.webServer>
- <modules runAllManagedModulesForAllRequests="true">
- <remove name="RoleManager" />
- <remove name="FormsAuthentication" />
- <add name="SessionAuthenticationModule" type="Microsoft.IdentityModel.Web.SessionAuthenticationModule, Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
- </modules>
- </system.webServer>
- <system.serviceModel>
- <serviceHostingEnvironment aspNetCompatibilityEnabled="true" />
- </system.serviceModel>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
- <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
- <entityFramework>
- <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
- <parameters>
- <parameter value="System.Data.SqlServerCe.4.0" />
- </parameters>
- </defaultConnectionFactory>
- </entityFramework>
- <system.data>
- <DbProviderFactories>
- <remove invariant="System.Data.SqlServerCe.4.0" />
- <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
- </DbProviderFactories>
- </system.data>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <configSections>
+ <section name="microsoft.identityModel" type="Microsoft.IdentityModel.Configuration.MicrosoftIdentityModelSection, Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ <section name="thinktecture.identityServer.repositories" type="Thinktecture.IdentityServer.Configuration.RepositoryConfigurationSection, Thinktecture.IdentityServer.Core" />
+ <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ </configSections>
+ <!-- ............................................... -->
+ <!-- start of identity server relevant configuration -->
+ <thinktecture.identityServer.repositories configSource="configuration\repositories.config" />
+ <microsoft.identityModel configSource="configuration\wif.config" />
+ <connectionStrings>
+ <add name="ProviderDB" connectionString="data source=.\sqlexpress;Integrated Security=SSPI;Initial Catalog=aspnetdb;MultipleActiveResultSets=True" providerName="System.Data.SqlClient" />
+ <add name="IdentityServerConfiguration" connectionString="data source=.\sqlexpress;Integrated Security=SSPI;Initial Catalog=IdentityServer;MultipleActiveResultSets=True" providerName="System.Data.EntityClient" />
+ </connectionStrings>
+ <!--<connectionStrings configSource="configuration\connectionStrings.config" />-->
+ <!--<system.diagnostics configSource="configuration\tracing.config" />-->
+ <location path="account/certificatesignin">
+ <system.webServer>
+ <security>
+ <access sslFlags="Ssl, SslNegotiateCert, SslRequireCert" />
+ </security>
+ </system.webServer>
+ </location>
+ <location path="issue/simple">
+ <system.webServer>
+ <security>
+ <access sslFlags="SslNegotiateCert" />
+ </security>
+ </system.webServer>
+ </location>
+ <location path="issue/oauth2">
+ <system.webServer>
+ <security>
+ <access sslFlags="SslNegotiateCert" />
+ </security>
+ </system.webServer>
+ </location>
+ <system.serviceModel>
+ <diagnostics>
+ <messageLogging logMessagesAtTransportLevel="true" logEntireMessage="true" logMalformedMessages="true" />
+ </diagnostics>
+ </system.serviceModel>
+ <!-- end of identity server relevant configuration -->
+ <!-- ............................................. -->
+ <appSettings>
+ <add key="ClientValidationEnabled" value="true" />
+ <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+ <add key="RouteDebugger:Enabled" value="false" />
+ <add key="UseSqlServerForConfiguration" value="true" />
+ </appSettings>
+ <system.web>
+ <customErrors mode="Off" />
+ <compilation debug="true" targetFramework="4.0">
+ <assemblies>
+ <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ <add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <add assembly="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+ </assemblies>
+ </compilation>
+ <authentication mode="None" />
+ <pages>
+ <namespaces>
+ <add namespace="System.Web.Helpers" />
+ <add namespace="System.Web.Mvc" />
+ <add namespace="System.Web.Mvc.Ajax" />
+ <add namespace="System.Web.Mvc.Html" />
+ <add namespace="System.Web.Routing" />
+ <add namespace="System.Web.WebPages" />
+ </namespaces>
+ </pages>
+ <!-- default membership provider -->
+ <membership defaultProvider="Membership">
+ <providers>
+ <clear />
+ <add name="Membership" type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="ProviderDB" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true" applicationName="/" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="7" minRequiredNonalphanumericCharacters="1" passwordAttemptWindow="10" passwordStrengthRegularExpression="" />
+ <!-- uncomment if you want to use the universal provider -->
+ <!--<add name="Membership"
+ type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+ connectionStringName="ProviderDB"
+ enablePasswordRetrieval="false"
+ enablePasswordReset="true"
+ requiresQuestionAndAnswer="false"
+ requiresUniqueEmail="false"
+ maxInvalidPasswordAttempts="5"
+ minRequiredPasswordLength="6"
+ minRequiredNonalphanumericCharacters="0"
+ passwordAttemptWindow="10"
+ applicationName="/" />-->
+ </providers>
+ </membership>
+ <roleManager enabled="true" defaultProvider="Roles">
+ <providers>
+ <clear />
+ <add name="Roles" type="System.Web.Security.SqlRoleProvider" connectionStringName="ProviderDB" applicationName="/" />
+ <!-- uncomment if you want to use the universal provider -->
+ <!--<add name="Roles"
+ type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+ connectionStringName="ProviderDB"
+ applicationName="/" />-->
+ </providers>
+ </roleManager>
+ <!--<profile configSource="configuration\profile.config" />-->
+ </system.web>
+ <system.webServer>
+ <modules runAllManagedModulesForAllRequests="true">
+ <remove name="RoleManager" />
+ <remove name="FormsAuthentication" />
+ <add name="SessionAuthenticationModule" type="Microsoft.IdentityModel.Web.SessionAuthenticationModule, Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ </modules>
+ </system.webServer>
+ <system.serviceModel>
+ <serviceHostingEnvironment aspNetCompatibilityEnabled="true" />
+ </system.serviceModel>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
View
605 OnPremise/WebSite/WebSite.csproj
@@ -1,312 +1,313 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>
- </ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{B9C90A36-86C0-4974-B0B4-3524F508D847}</ProjectGuid>
- <ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Thinktecture.IdentityServer.Web</RootNamespace>
- <AssemblyName>Thinktecture.IdentityServer.Web</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <MvcBuildViews>false</MvcBuildViews>
- <UseIISExpress>false</UseIISExpress>
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <UseVSHostingProcess>true</UseVSHostingProcess>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="AutoMapper, Version=2.1.265.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\AutoMapper.2.1.265\lib\net40\AutoMapper.dll</HintPath>
- </Reference>
- <Reference Include="EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\EntityFramework.4.3.1\lib\net40\EntityFramework.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.IdentityModel, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <Private>True</Private>
- </Reference>
- <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <Private>True</Private>
- <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
- </Reference>
- <Reference Include="RouteDebugger, Version=2.1.1.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\routedebugger.2.1.1\lib\net40\RouteDebugger.dll</HintPath>
- </Reference>
- <Reference Include="System.ComponentModel.Composition" />
- <Reference Include="System.Data.Entity" />
- <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\SqlServerCompact.4.0.8852.1\lib\net40\System.Data.SqlServerCe.dll</HintPath>
- </Reference>
- <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\SqlServerCompact.4.0.8852.1\lib\net40\System.Data.SqlServerCe.Entity.dll</HintPath>
- </Reference>
- <Reference Include="System.IdentityModel" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Security" />
- <Reference Include="System.ServiceModel" />
- <Reference Include="System.ServiceModel.Activation" />
- <Reference Include="System.Transactions" />
- <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System.Web.Providers">
- <HintPath>..\packages\System.Web.Providers.1.0.1\lib\Net40\System.Web.Providers.dll</HintPath>
- </Reference>
- <Reference Include="System.Web.WebPages" />
- <Reference Include="System.Web.Helpers" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Web.DynamicData" />
- <Reference Include="System.Web.Entity" />
- <Reference Include="System.Web.ApplicationServices" />
- <Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Web" />
- <Reference Include="System.Web.Extensions" />
- <Reference Include="System.Web.Abstractions" />
- <Reference Include="System.Web.Routing" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Web.Services" />
- <Reference Include="System.EnterpriseServices" />
- <Reference Include="Thinktecture.IdentityModel, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Thinktecture.IdentityModel.1.3.0.0\lib\Thinktecture.IdentityModel.dll</HintPath>
- </Reference>
- <Reference Include="WebActivator, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\WebActivator.1.5\lib\net40\WebActivator.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="App_Start\EntityFramework.SqlServerCompact.cs" />
- <Compile Include="Global.asax.cs">
- <DependentUpon>Global.asax</DependentUpon>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="App_Data\IdentityServerConfiguration.sdf" />
- <Content Include="Content\images\logo.jpg" />
- <EmbeddedResource Include="Content\resources\jsnotify.htm" />
- <Content Include="Global.asax" />
- <Content Include="Content\Site.css" />
- <Content Include="Content\themes\base\jquery-ui.css" />
- <Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
- <Content Include="Content\themes\base\images\ui-bg_flat_75_ffffff_40x100.png" />
- <Content Include="Content\themes\base\images\ui-bg_glass_55_fbf9ee_1x400.png" />
- <Content Include="Content\themes\base\images\ui-bg_glass_65_ffffff_1x400.png" />
- <Content Include="Content\themes\base\images\ui-bg_glass_75_dadada_1x400.png" />
- <Content Include="Content\themes\base\images\ui-bg_glass_75_e6e6e6_1x400.png" />
- <Content Include="Content\themes\base\images\ui-bg_glass_95_fef1ec_1x400.png" />
- <Content Include="Content\themes\base\images\ui-bg_highlight-soft_75_cccccc_1x100.png" />
- <Content Include="Content\themes\base\images\ui-icons_222222_256x240.png" />
- <Content Include="Content\themes\base\images\ui-icons_2e83ff_256x240.png" />
- <Content Include="Content\themes\base\images\ui-icons_454545_256x240.png" />
- <Content Include="Content\themes\base\images\ui-icons_888888_256x240.png" />
- <Content Include="Content\themes\base\images\ui-icons_cd0a0a_256x240.png" />
- <Content Include="license.txt" />
- <Content Include="readme.txt" />
- <Content Include="Scripts\jquery-1.7.1-vsdoc.js" />
- <Content Include="Scripts\jquery-1.7.1.js" />
- <Content Include="Scripts\jquery-1.7.1.min.js" />
- <Content Include="Web.config">
- <SubType>Designer</SubType>
- </Content>
- <Content Include="Web.Debug.config">
- <DependentUpon>Web.config</DependentUpon>
- </Content>
- <Content Include="Web.Release.config">
- <DependentUpon>Web.config</DependentUpon>
- </Content>
- <Content Include="Scripts\jquery.unobtrusive-ajax.js" />
- <Content Include="Scripts\jquery.unobtrusive-ajax.min.js" />
- <Content Include="Scripts\jquery.validate.js" />
- <Content Include="Scripts\jquery.validate.min.js" />
- <Content Include="Scripts\jquery.validate.unobtrusive.js" />
- <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
- <Content Include="Scripts\jquery.validate-vsdoc.js" />
- <Content Include="Scripts\jquery-ui.js" />
- <Content Include="Scripts\jquery-ui.min.js" />
- <Content Include="Scripts\MicrosoftAjax.js" />
- <Content Include="Scripts\MicrosoftAjax.debug.js" />
- <Content Include="Scripts\MicrosoftMvcAjax.js" />
- <Content Include="Scripts\MicrosoftMvcAjax.debug.js" />
- <Content Include="Scripts\MicrosoftMvcValidation.js" />
- <Content Include="Scripts\MicrosoftMvcValidation.debug.js" />
- <Content Include="Views\Web.config" />
- <Content Include="Views\_ViewStart.cshtml" />
- <Content Include="Views\Shared\Error.cshtml" />
- <Content Include="Views\Shared\_Layout.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\Home\Index.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\Account\SignIn.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Configuration\repositories.config" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Configuration\wif.config" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Configuration\connectionStrings.config" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Configuration\profile.config" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Configuration\tracing.config" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\Admin\Index.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\Admin\MyClaims.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\Admin\Configuration.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\Admin\Endpoints.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\Admin\Certificates.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\RelyingPartiesAdmin\Index.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\RelyingPartiesAdmin\Edit.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\RelyingPartiesAdmin\Delete.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\RelyingPartiesAdmin\Add.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\ClientCertificatesAdmin\Index.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\ClientCertificatesAdmin\Edit.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\ClientCertificatesAdmin\Delete.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\ClientCertificatesAdmin\Add.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\DelegationAdmin\Index.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\DelegationAdmin\Add.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\DelegationAdmin\Edit.cshtml" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Views\DelegationAdmin\Delete.cshtml" />
- </ItemGroup>
- <ItemGroup>