diff options
17 files changed, 578 insertions, 202 deletions
diff --git a/TwoStepsAuthenticator.TestApp/App.config b/TwoStepsAuthenticator.TestApp/App.config new file mode 100644 index 0000000..8e15646 --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/App.config @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> + </startup> +</configuration>
\ No newline at end of file diff --git a/TwoStepsAuthenticator.TestApp/App.xaml b/TwoStepsAuthenticator.TestApp/App.xaml new file mode 100644 index 0000000..9c7a5dd --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/App.xaml @@ -0,0 +1,8 @@ +<Application x:Class="TwoStepsAuthenticatorTestApp.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + StartupUri="MainWindow.xaml"> + <Application.Resources> + + </Application.Resources> +</Application> diff --git a/TwoStepsAuthenticator.TestApp/App.xaml.cs b/TwoStepsAuthenticator.TestApp/App.xaml.cs new file mode 100644 index 0000000..edab435 --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace TwoStepsAuthenticatorTestApp +{ + /// <summary> + /// Interaction logic for App.xaml + /// </summary> + public partial class App : Application + { + } +} diff --git a/TwoStepsAuthenticator.TestApp/MainWindow.xaml b/TwoStepsAuthenticator.TestApp/MainWindow.xaml new file mode 100644 index 0000000..43d5dd3 --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/MainWindow.xaml @@ -0,0 +1,16 @@ +<Window x:Class="TwoStepsAuthenticatorTestApp.MainWindow" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + Title="MainWindow" Height="350" Width="525"> + <Grid> + <Grid.RowDefinitions> + <RowDefinition Height="Auto"/> + <RowDefinition Height="Auto"/> + <RowDefinition Height="*"/> + </Grid.RowDefinitions> + + <TextBox Grid.Row="0" Text="{Binding Key}"/> + <TextBlock Grid.Row="1" Text="{Binding Count}"></TextBlock> + <TextBlock Grid.Row="2" Text="{Binding Code}"></TextBlock> + </Grid> +</Window> diff --git a/TwoStepsAuthenticator.TestApp/MainWindow.xaml.cs b/TwoStepsAuthenticator.TestApp/MainWindow.xaml.cs new file mode 100644 index 0000000..3a1ae68 --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/MainWindow.xaml.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace TwoStepsAuthenticatorTestApp +{ + /// <summary> + /// Interaction logic for MainWindow.xaml + /// </summary> + public partial class MainWindow : Window + { + ViewModel model; + public MainWindow() + { + InitializeComponent(); + model = new ViewModel(); + model.Key="JBSWY3DPEHPK3PXP"; + this.DataContext = model; + } + + private void Button_Click(object sender, RoutedEventArgs e) + { + model.GetCode(); + } + } +} diff --git a/TwoStepsAuthenticator.TestApp/Properties/AssemblyInfo.cs b/TwoStepsAuthenticator.TestApp/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..96de97e --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("TwoStepsAuthenticator.TestApp")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("TwoStepsAuthenticator.TestApp")] +[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file +//inside a <PropertyGroup>. For example, if you are using US english +//in your source files, set the <UICulture> to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/TwoStepsAuthenticator.TestApp/Properties/Resources.Designer.cs b/TwoStepsAuthenticator.TestApp/Properties/Resources.Designer.cs new file mode 100644 index 0000000..d1c6b00 --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:4.0.30319.18033 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace TwoStepsAuthenticatorTestApp.Properties { + using System; + + + /// <summary> + /// A strongly-typed resource class, for looking up localized strings, etc. + /// </summary> + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// <summary> + /// Returns the cached ResourceManager instance used by this class. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TwoStepsAuthenticatorTestApp.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// <summary> + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/TwoStepsAuthenticator.TestApp/Properties/Resources.resx b/TwoStepsAuthenticator.TestApp/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/Properties/Resources.resx @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ No newline at end of file diff --git a/TwoStepsAuthenticator.TestApp/Properties/Settings.Designer.cs b/TwoStepsAuthenticator.TestApp/Properties/Settings.Designer.cs new file mode 100644 index 0000000..80f5e8b --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Runtime Version:4.0.30319.18033 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace TwoStepsAuthenticatorTestApp.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/TwoStepsAuthenticator.TestApp/Properties/Settings.settings b/TwoStepsAuthenticator.TestApp/Properties/Settings.settings new file mode 100644 index 0000000..033d7a5 --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/Properties/Settings.settings @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='utf-8'?> +<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)"> + <Profiles> + <Profile Name="(Default)" /> + </Profiles> + <Settings /> +</SettingsFile>
\ No newline at end of file diff --git a/TwoStepsAuthenticator.TestApp/TwoStepsAuthenticator.TestApp.csproj b/TwoStepsAuthenticator.TestApp/TwoStepsAuthenticator.TestApp.csproj new file mode 100644 index 0000000..577f330 --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/TwoStepsAuthenticator.TestApp.csproj @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{53C4F81C-4322-4637-B79B-8676ACAEFDCB}</ProjectGuid> + <OutputType>WinExe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>TwoStepsAuthenticatorTestApp</RootNamespace> + <AssemblyName>TwoStepsAuthenticator.TestApp</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="System.Xaml"> + <RequiredTargetFramework>4.0</RequiredTargetFramework> + </Reference> + <Reference Include="WindowsBase" /> + <Reference Include="PresentationCore" /> + <Reference Include="PresentationFramework" /> + </ItemGroup> + <ItemGroup> + <ApplicationDefinition Include="App.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </ApplicationDefinition> + <Compile Include="ViewModel.cs" /> + <Page Include="MainWindow.xaml"> + <Generator>MSBuild:Compile</Generator> + <SubType>Designer</SubType> + </Page> + <Compile Include="App.xaml.cs"> + <DependentUpon>App.xaml</DependentUpon> + <SubType>Code</SubType> + </Compile> + <Compile Include="MainWindow.xaml.cs"> + <DependentUpon>MainWindow.xaml</DependentUpon> + <SubType>Code</SubType> + </Compile> + </ItemGroup> + <ItemGroup> + <Compile Include="Properties\AssemblyInfo.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="Properties\Resources.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Resources.resx</DependentUpon> + </Compile> + <Compile Include="Properties\Settings.Designer.cs"> + <AutoGen>True</AutoGen> + <DependentUpon>Settings.settings</DependentUpon> + <DesignTimeSharedInput>True</DesignTimeSharedInput> + </Compile> + <EmbeddedResource Include="Properties\Resources.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + </EmbeddedResource> + <None Include="Properties\Settings.settings"> + <Generator>SettingsSingleFileGenerator</Generator> + <LastGenOutput>Settings.Designer.cs</LastGenOutput> + </None> + <AppDesigner Include="Properties\" /> + </ItemGroup> + <ItemGroup> + <None Include="App.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\TwoStepsAuthenticator\TwoStepsAuthenticator.csproj"> + <Project>{6c898cd1-0bf3-4711-847e-ad7dac815cd8}</Project> + <Name>TwoStepsAuthenticator</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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>
\ No newline at end of file diff --git a/TwoStepsAuthenticator.TestApp/ViewModel.cs b/TwoStepsAuthenticator.TestApp/ViewModel.cs new file mode 100644 index 0000000..51db3a8 --- /dev/null +++ b/TwoStepsAuthenticator.TestApp/ViewModel.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Timers; +using System.Windows.Threading; + +namespace TwoStepsAuthenticatorTestApp +{ + public class ViewModel : INotifyPropertyChanged + { + private string key; + public string Key + { + get + { + return key; + } + set + { + if (key != value) + { + key = value; + RaisePropertyChanged("Key"); + } + } + } + + private string code; + public string Code + { + get + { + return code; + } + set + { + if (code != value) + { + code = value; + RaisePropertyChanged("Code"); + GetCode(); + } + } + } + + private int count; + public int Count + { + get + { + return count; + } + set + { + if (count != value) + { + count = value; + if (count < 0) + { + count = 30; + GetCode(); + } + RaisePropertyChanged("Count"); + } + } + } + + DispatcherTimer timer; + + public ViewModel() + { + timer = new DispatcherTimer(TimeSpan.FromSeconds(1), DispatcherPriority.Normal, timerCallback, App.Current.Dispatcher); + //timer.Elapsed += timer_Elapsed; + timer.Start(); + } + + private void timerCallback(object sender, EventArgs e) + { + Count--; + } + + + public event PropertyChangedEventHandler PropertyChanged; + private void RaisePropertyChanged(string propertyName) + { + if (PropertyChanged != null) + { + PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + + internal void GetCode() + { + var auth = new TwoStepsAuthenticator.Authenticator(); + Code = auth.GetCode(this.Key); + } + } +} diff --git a/TwoStepsAuthenticator.TestWebsite/TwoStepsAuthenticator.TestWebsite.csproj b/TwoStepsAuthenticator.TestWebsite/TwoStepsAuthenticator.TestWebsite.csproj index 462f918..68538de 100644 --- a/TwoStepsAuthenticator.TestWebsite/TwoStepsAuthenticator.TestWebsite.csproj +++ b/TwoStepsAuthenticator.TestWebsite/TwoStepsAuthenticator.TestWebsite.csproj @@ -57,7 +57,6 @@ <Reference Include="System.EnterpriseServices" /> </ItemGroup> <ItemGroup> - <Content Include="default.html" /> <Content Include="Web.config" /> </ItemGroup> <ItemGroup> @@ -71,6 +70,12 @@ <DependentUpon>Web.config</DependentUpon> </None> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\TwoStepsAuthenticator\TwoStepsAuthenticator.csproj"> + <Project>{6c898cd1-0bf3-4711-847e-ad7dac815cd8}</Project> + <Name>TwoStepsAuthenticator</Name> + </ProjectReference> + </ItemGroup> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> diff --git a/TwoStepsAuthenticator.TestWebsite/default.html b/TwoStepsAuthenticator.TestWebsite/default.html deleted file mode 100644 index ad8522c..0000000 --- a/TwoStepsAuthenticator.TestWebsite/default.html +++ /dev/null @@ -1,199 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <meta http-equiv="content-type" content="text/html; charset=UTF-8"> - <title> - jsFiddle demo by russau</title> - - <script type='text/javascript' src='http://code.jquery.com/jquery-1.6.4.js'></script> - <link rel="stylesheet" type="text/css" href="/css/normalize.css"> - - - <link rel="stylesheet" type="text/css" href="/css/result-light.css"> - - - <link rel="stylesheet" type="text/css" href="http://twitter.github.com/bootstrap/1.3.0/bootstrap.css"> - - - - - - <script type='text/javascript' src="https://github.com/Caligatio/jsSHA/raw/master/src/sha.js"></script> - - - <style type='text/css'> - body { padding-top: 60px; } -.container-fluid { min-width: 100px } - - </style> - - - -<script type='text/javascript'>//<![CDATA[ - - function dec2hex(s) { return (s < 15.5 ? '0' : '') + Math.round(s).toString(16); } - function hex2dec(s) { return parseInt(s, 16); } - - function base32tohex(base32) { - var base32chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; - var bits = ""; - var hex = ""; - - for (var i = 0; i < base32.length; i++) { - var val = base32chars.indexOf(base32.charAt(i).toUpperCase()); - bits += leftpad(val.toString(2), 5, '0'); - } - - for (var i = 0; i + 4 <= bits.length; i += 4) { - var chunk = bits.substr(i, 4); - hex = hex + parseInt(chunk, 2).toString(16); - } - return hex; - - } - - function leftpad(str, len, pad) { - if (len + 1 >= str.length) { - str = Array(len + 1 - str.length).join(pad) + str; - } - return str; - } - - function updateOtp() { - - var key = base32tohex($('#secret').val()); - - //var date = new Date(); - var date = new Date(2013, 5, 12, 18, 0, 0, 0); //12 juin 2013 18h00 - - var epoch = Math.round(date.getTime() / 1000.0); - - - - var time = leftpad(dec2hex(Math.floor(epoch / 30)), 16, '0'); - - var hmacObj = new jsSHA(time, 'HEX'); - var hmac = hmacObj.getHMAC(key, 'HEX', 'SHA-1', "HEX"); - - $('#qrImg').attr('src', 'https://chart.googleapis.com/chart?chs=200x200&cht=qr&chl=200x200&chld=M|0&cht=qr&chl=otpauth://totp/user@host.com%3Fsecret%3D' + $('#secret').val()); - $('#secretHex').text(key); - $('#secretHexLength').text((key.length * 4) + ' bits'); - $('#epoch').text(time); - $('#hmac').empty(); - - if (hmac == 'KEY MUST BE IN BYTE INCREMENTS') { - $('#hmac').append($('<span/>').addClass('label important').append(hmac)); - } else { - var offset = hex2dec(hmac.substring(hmac.length - 1)); - var part1 = hmac.substr(0, offset * 2); - var part2 = hmac.substr(offset * 2, 8); - var part3 = hmac.substr(offset * 2 + 8, hmac.length - offset); - if (part1.length > 0) $('#hmac').append($('<span/>').addClass('label').append(part1)); - $('#hmac').append($('<span/>').addClass('label success').append(part2)); - if (part3.length > 0) $('#hmac').append($('<span/>').addClass('label').append(part3)); - } - - var otp = (hex2dec(hmac.substr(offset * 2, 8)) & hex2dec('7fffffff')) + ''; - otp = (otp).substr(otp.length - 6, 6); - - $('#otp').text(otp); - - var a = otp; - } - - function timer() { - var epoch = Math.round(new Date().getTime() / 1000.0); - var countDown = 30 - (epoch % 30); - if (epoch % 30 == 0) updateOtp(); - $('#updatingIn').text(countDown); - - } - - $(function () { - updateOtp(); - - $('#update').click(function (event) { - updateOtp(); - event.preventDefault(); - }); - - $('#secret').keyup(function () { - updateOtp(); - }); - - setInterval(timer, 1000); - }); - //]]> - -</script> - - -</head> -<body> - <div class="container-fluid"> - <div> - <div class="row"> - <div class="span8"> - <h1>Time-based One-time Password Algorithm</h1> - <p>This page contains a javascript implementation of the <em>Time-based One-time Password Algorithm</em> used by Google Authenticator and described in the <a href="http://tools.ietf.org/id/draft-mraihi-totp-timebased-06.html">TOTP RFC Draft</a>.</p> - - <p>Install Google Authenticator on your smartphone: <a href="http://itunes.apple.com/au/app/google-authenticator/id388497605?mt=8">iOS</a>, <a href="https://market.android.com/details?id=com.google.android.apps.authenticator&hl=en">Android</a>, <a href="http://m.google.com/authenticator">Blackberry</a>. As the TOTP is an open standard you can use this app to create one-time passwords for your own application. You add an account plus secret by scanning a QR code (more info on the <a href="http://code.google.com/p/google-authenticator/wiki/KeyUriFormat">google code wiki</a>). The javascript below implements the algorithm the smartphone app uses to generate the OTP - you would use this same algorithm <em>server-side</em> to verify an OTP.</p> - - <p>Put it to the test by setting the base32 secret, scanning the QR code in Google Authenticate. You should see the same OTP on your smartphone and displayed at the bottom on the page.</p> - - </div> - </div> - <div class="row"> - - <form> - <fieldset> - - <div class="clearfix"> - <label for="secret">Secret (base32)</label> - <div class="input"><input type="text" size="30" name="secret" id="secret" class="xlarge" value="JBSWY3DPEHPK3PXP" /></div> - </div> - <!-- /clearfix --> - <div class="clearfix"> - <label>Secret (hex)</label> - <div class="input"><span class="label" id="secretHex"></span> - <span id='secretHexLength'></span></div> - </div> - <!-- /clearfix --> - <div class="clearfix"> - <label>QR Code</label> - <div class="input"><img id="qrImg" src="" /></div> - </div> - <!-- /clearfix --> - <div class="clearfix"> - <label>Unix epoch div 30 (padded hex)</label> - <div class="input"><span class="label" id='epoch'></span></div> - </div> - <!-- /clearfix --> - <div class="clearfix"> - <label>HMAC(secret, time)</label> - <div class="input" id='hmac'></div> - </div> - <!-- /clearfix --> - <div class="clearfix"> - <label>One-time Password</label> - <div class="input"><span class="label success" id='otp'></span></div> - </div> - <!-- /clearfix --> - <div class="clearfix"> - <label>Updating in</label> - <div class="input"><span id='updatingIn'></span></div> - </div> - <!-- /clearfix --> - - - </fieldset> - </form> - </div> - </div> - </div> - - -</body> - - -</html> - diff --git a/TwoStepsAuthenticator.TestWebsite.sln b/TwoStepsAuthenticator.sln index 2cf0269..b69b71c 100644 --- a/TwoStepsAuthenticator.TestWebsite.sln +++ b/TwoStepsAuthenticator.sln @@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwoStepsAuthenticator.TestW EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwoStepsAuthenticator", "TwoStepsAuthenticator\TwoStepsAuthenticator.csproj", "{6C898CD1-0BF3-4711-847E-AD7DAC815CD8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwoStepsAuthenticator.TestApp", "TwoStepsAuthenticator.TestApp\TwoStepsAuthenticator.TestApp.csproj", "{53C4F81C-4322-4637-B79B-8676ACAEFDCB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -19,6 +21,10 @@ Global {6C898CD1-0BF3-4711-847E-AD7DAC815CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU {6C898CD1-0BF3-4711-847E-AD7DAC815CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU {6C898CD1-0BF3-4711-847E-AD7DAC815CD8}.Release|Any CPU.Build.0 = Release|Any CPU + {53C4F81C-4322-4637-B79B-8676ACAEFDCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53C4F81C-4322-4637-B79B-8676ACAEFDCB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53C4F81C-4322-4637-B79B-8676ACAEFDCB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53C4F81C-4322-4637-B79B-8676ACAEFDCB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TwoStepsAuthenticator/TwoStepsAuthenticator.cs b/TwoStepsAuthenticator/Authenticator.cs index 958c211..de383d9 100644 --- a/TwoStepsAuthenticator/TwoStepsAuthenticator.cs +++ b/TwoStepsAuthenticator/Authenticator.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace TwoStepsAuthenticator { - public class TwoStepsAuthenticator + public class Authenticator { public string GetCode(string secret) diff --git a/TwoStepsAuthenticator/TwoStepsAuthenticator.csproj b/TwoStepsAuthenticator/TwoStepsAuthenticator.csproj index 0f7341e..6a37cfe 100644 --- a/TwoStepsAuthenticator/TwoStepsAuthenticator.csproj +++ b/TwoStepsAuthenticator/TwoStepsAuthenticator.csproj @@ -40,7 +40,7 @@ </ItemGroup> <ItemGroup> <Compile Include="Base32Encoding.cs" /> - <Compile Include="TwoStepsAuthenticator.cs" /> + <Compile Include="Authenticator.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="UnixTimeHelper.cs" /> </ItemGroup> |