Permalink
Browse files

Supprime service web et ajoute les liens relatifs

  • Loading branch information...
1 parent de637d4 commit 009a04a5e95c26f770118746ff890d2be93ac9f2 @coylz coylz committed Dec 10, 2012
Showing with 58 additions and 1,514 deletions.
  1. +1 −0 adresse_deploiement.txt
  2. +0 −9 publication/HobbyCartes/HobbyCartes.sln
  3. +0 −2 publication/HobbyCartes/HobbyCartes/Connexion.aspx.vb
  4. +1 −27 publication/HobbyCartes/HobbyCartes/HobbyCartes.vbproj
  5. +0 −2 publication/HobbyCartes/HobbyCartes/Inscription.aspx.vb
  6. +5 −5 publication/HobbyCartes/HobbyCartes/Membre.master
  7. +7 −7 publication/HobbyCartes/HobbyCartes/Membre.master.vb
  8. +2 −2 publication/HobbyCartes/HobbyCartes/MembreEditerFiche.aspx.vb
  9. +40 −0 publication/HobbyCartes/HobbyCartes/Securite.vb
  10. +0 −10 publication/HobbyCartes/HobbyCartes/Service References/ServiceSecurite/HC_service_web.xsd
  11. +0 −10 ...bbyCartes/Service References/ServiceSecurite/HobbyCartes.ServiceSecurite.CompositeType.datasource
  12. +0 −33 publication/HobbyCartes/HobbyCartes/Service References/ServiceSecurite/Reference.svcmap
  13. +0 −146 publication/HobbyCartes/HobbyCartes/Service References/ServiceSecurite/Reference.vb
  14. +0 −10 publication/HobbyCartes/HobbyCartes/Service References/ServiceSecurite/configuration.svcinfo
  15. +0 −216 publication/HobbyCartes/HobbyCartes/Service References/ServiceSecurite/configuration91.svcinfo
  16. +0 −359 publication/HobbyCartes/HobbyCartes/Service References/ServiceSecurite/service.wsdl
  17. +0 −62 publication/HobbyCartes/HobbyCartes/Service References/ServiceSecurite/service.xsd
  18. +0 −42 publication/HobbyCartes/HobbyCartes/Service References/ServiceSecurite/service1.xsd
  19. +2 −19 publication/HobbyCartes/HobbyCartes/Web.config
  20. +0 −40 publication/HobbyCartes/serviceweb_hc/App.config
  21. +0 −119 publication/HobbyCartes/serviceweb_hc/HC_service_web.vbproj
  22. +0 −15 publication/HobbyCartes/serviceweb_hc/HC_service_web.vbproj.user
  23. +0 −31 publication/HobbyCartes/serviceweb_hc/ISecurite_hc.vb
  24. +0 −35 publication/HobbyCartes/serviceweb_hc/My Project/AssemblyInfo.vb
  25. +0 −63 publication/HobbyCartes/serviceweb_hc/My Project/Resources.Designer.vb
  26. +0 −117 publication/HobbyCartes/serviceweb_hc/My Project/Resources.resx
  27. +0 −73 publication/HobbyCartes/serviceweb_hc/My Project/Settings.Designer.vb
  28. +0 −7 publication/HobbyCartes/serviceweb_hc/My Project/Settings.settings
  29. +0 −53 publication/HobbyCartes/serviceweb_hc/ServiceHash.vb
View
@@ -0,0 +1 @@
+http://205.236.12.106/HobbyCartes/Accueil.aspx
@@ -2,11 +2,6 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HobbyCartes", "HobbyCartes\HobbyCartes.vbproj", "{5C766283-3B8E-476D-A7FE-5138D647CCE8}"
- ProjectSection(ProjectDependencies) = postProject
- {48899A41-AFF3-4D25-9A0D-142AEC018258} = {48899A41-AFF3-4D25-9A0D-142AEC018258}
- EndProjectSection
-EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HC_service_web", "serviceweb_hc\HC_service_web.vbproj", "{48899A41-AFF3-4D25-9A0D-142AEC018258}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,10 +13,6 @@ Global
{5C766283-3B8E-476D-A7FE-5138D647CCE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C766283-3B8E-476D-A7FE-5138D647CCE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C766283-3B8E-476D-A7FE-5138D647CCE8}.Release|Any CPU.Build.0 = Release|Any CPU
- {48899A41-AFF3-4D25-9A0D-142AEC018258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {48899A41-AFF3-4D25-9A0D-142AEC018258}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {48899A41-AFF3-4D25-9A0D-142AEC018258}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {48899A41-AFF3-4D25-9A0D-142AEC018258}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -7,7 +7,6 @@
Imports MySql.Data
Imports MySql.Data.MySqlClient
Imports System.IO
-Imports HobbyCartes.ServiceSecurite
Public Class Connexion
Inherits System.Web.UI.Page
@@ -26,7 +25,6 @@ Public Class Connexion
Dim motPasse As String = txtMotPasse.Text
'Sécurité mot de passe
- Dim securite As Securite_hcClient = New Securite_hcClient()
motPasse = securite.HashPass(motPasse, pseudo)
Dim id As Integer
@@ -145,15 +145,6 @@
<Content Include="MySQL\MySql.Data.Entity.dll" />
<Content Include="MySQL\MySql.Web.dll" />
<Content Include="Recherche.aspx" />
- <None Include="Service References\ServiceSecurite\configuration91.svcinfo" />
- <None Include="Service References\ServiceSecurite\configuration.svcinfo" />
- <None Include="Service References\ServiceSecurite\HobbyCartes.ServiceSecurite.CompositeType.datasource">
- <DependentUpon>Reference.svcmap</DependentUpon>
- </None>
- <None Include="Service References\ServiceSecurite\Reference.svcmap">
- <Generator>WCF Proxy Generator</Generator>
- <LastGenOutput>Reference.vb</LastGenOutput>
- </None>
<Content Include="script\jquery.js" />
<Content Include="Web.config" />
<Content Include="Web.Debug.config">
@@ -301,11 +292,7 @@
<DependentUpon>Fiche.aspx</DependentUpon>
<SubType>ASPXCodebehind</SubType>
</Compile>
- <Compile Include="Service References\ServiceSecurite\Reference.vb">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Reference.svcmap</DependentUpon>
- </Compile>
+ <Compile Include="Securite.vb" />
<Compile Include="Settings.vb" />
<Compile Include="Connexion.aspx.designer.vb">
<DependentUpon>Connexion.aspx</DependentUpon>
@@ -343,24 +330,11 @@
<CustomToolNamespace>My</CustomToolNamespace>
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
- <None Include="Service References\ServiceSecurite\HC_service_web.xsd">
- <SubType>Designer</SubType>
- </None>
- <None Include="Service References\ServiceSecurite\service.wsdl" />
- <None Include="Service References\ServiceSecurite\service.xsd">
- <SubType>Designer</SubType>
- </None>
- <None Include="Service References\ServiceSecurite\service1.xsd">
- <SubType>Designer</SubType>
- </None>
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
- <WCFMetadataStorage Include="Service References\ServiceSecurite\" />
- </ItemGroup>
- <ItemGroup>
<Folder Include="sauvegardes\" />
</ItemGroup>
<ItemGroup>
@@ -6,7 +6,6 @@
Imports MySql.Data
Imports MySql.Data.MySqlClient
-Imports HobbyCartes.ServiceSecurite
Public Class Inscription
Inherits System.Web.UI.Page
@@ -47,7 +46,6 @@ Public Class Inscription
m_membre.Courriel = txtCourriel.Text
'Sécurité du mot de passe
- Dim securite As Securite_hcClient = New Securite_hcClient()
Dim motPasse As String = securite.HashPass(txtMotPasse.Text, m_membre.nomUtilisateur)
Dim motPasse2 As String = securite.HashPass(txtRepMotPasse.Text, m_membre.nomUtilisateur)
@@ -3,11 +3,11 @@
<asp:Content ContentPlaceHolderID="cphCorps" runat="server">
<div id="membre">
<div id="membre_onglets">
- <a class="onglet" href="/MembreInfo.aspx" id="ongletInformations" runat="server" >Informations</a>
- <a class="onglet" href="/MembreListeCartes.aspx" id="ongletListeCartes" runat="server" >Liste des cartes</a>
- <a class="onglet" href="/MembreGererCollections.aspx" id="ongletGererCollections" runat="server" >Gérer ses collections</a>
- <a class="onglet" href="/MembreVisualiserMessages.aspx" id="ongletVisualiserMessages" runat="server" >Visualiser ses messages</a>
- <a class="onglet" href="/MembreEnvoiMessage.aspx" id="ongletEnvoiMessage" runat="server" >Envoyer un message</a>
+ <a class="onglet" href="MembreInfo.aspx" id="ongletInformations" runat="server" >Informations</a>
+ <a class="onglet" href="MembreListeCartes.aspx" id="ongletListeCartes" runat="server" >Liste des cartes</a>
+ <a class="onglet" href="MembreGererCollections.aspx" id="ongletGererCollections" runat="server" >Gérer ses collections</a>
+ <a class="onglet" href="MembreVisualiserMessages.aspx" id="ongletVisualiserMessages" runat="server" >Visualiser ses messages</a>
+ <a class="onglet" href="MembreEnvoiMessage.aspx" id="ongletEnvoiMessage" runat="server" >Envoyer un message</a>
</div>
<div id="membre_contenu">
<asp:ContentPlaceHolder ID="cphPageMembreContenu" runat="server" />
@@ -49,17 +49,17 @@ Public Class Membre
End If
End If
- If Request.ServerVariables("URL").Equals("/MembreInfo.aspx") Then
+ If Request.ServerVariables("URL").Equals("MembreInfo.aspx") Then
ongletInformations.Style.Add("background-color", "Black")
- ElseIf Request.ServerVariables("URL").Equals("/MembreListeCartes.aspx") Then
+ ElseIf Request.ServerVariables("URL").Equals("MembreListeCartes.aspx") Then
ongletListeCartes.Style.Add("background-color", "Black")
- ElseIf Request.ServerVariables("URL").Equals("/MembreGererCollections.aspx") Or
- Request.ServerVariables("URL").Equals("/MembreEditerFiche.aspx") Then
+ ElseIf Request.ServerVariables("URL").Equals("MembreGererCollections.aspx") Or
+ Request.ServerVariables("URL").Equals("MembreEditerFiche.aspx") Then
ongletGererCollections.Style.Add("background-color", "Black")
- ElseIf Request.ServerVariables("URL").Equals("/MembreVisualiserMessages.aspx") Or
- Request.ServerVariables("URL").Equals("/MembreVisualiserMessage.aspx") Then
+ ElseIf Request.ServerVariables("URL").Equals("MembreVisualiserMessages.aspx") Or
+ Request.ServerVariables("URL").Equals("MembreVisualiserMessage.aspx") Then
ongletVisualiserMessages.Style.Add("background-color", "Black")
- ElseIf Request.ServerVariables("URL").Equals("/MembreEnvoiMessage.aspx") Then
+ ElseIf Request.ServerVariables("URL").Equals("MembreEnvoiMessage.aspx") Then
ongletEnvoiMessage.Style.Add("background-color", "Black")
End If
End Sub
@@ -191,9 +191,9 @@ Public Class MembreEditerFiche
fiche.sauvegarde()
If Boolean.Parse(Session("Admin")) And Not IsNothing(Request.QueryString("pseudo")) Then
- Response.Redirect("/MembreGererCollections.aspx?pseudo=" & Request.QueryString("pseudo"))
+ Response.Redirect("MembreGererCollections.aspx?pseudo=" & Request.QueryString("pseudo"))
Else
- Response.Redirect("/MembreGererCollections.aspx")
+ Response.Redirect("MembreGererCollections.aspx")
End If
End Sub
@@ -0,0 +1,40 @@
+Imports System.Text
+Imports System.Security.Cryptography
+
+Public Class Securite
+
+ Public Shared Function ComparerMotPasses(motPass1 As String, motPass2 As String) As Boolean
+ Dim tmpMotPass1() As Byte = Convert.FromBase64String(motPass1)
+ Dim tmpMotPass2() As Byte = Convert.FromBase64String(motPass2)
+
+ Try
+ For i As Integer = 0 To (tmpMotPass1.Length - 1)
+
+ 'Si les octets ne concordent pas
+ If Not tmpMotPass1(i).Equals(tmpMotPass2(i)) Then
+ Return False
+ End If
+
+ Next
+
+ Return True
+ Catch ex As Exception
+ Return False
+ End Try
+ End Function
+
+ Public Shared Function HashPass(motPass As String, salt As String) As String
+ Dim tmpMotPass As String = Nothing
+ Dim tmpSalt() As Byte = Encoding.UTF8.GetBytes(salt)
+
+ 'Ajout d'un peu de sel au mot de passe!
+ tmpMotPass = Convert.ToBase64String(tmpSalt) + motPass
+
+ 'Obtient les octets du mot de passe et les hachent en SHA2
+ Dim octets() As Byte = New SHA384Managed().ComputeHash(Encoding.UTF8.GetBytes(tmpMotPass))
+
+ 'Retourne le hash en SHA2
+ Return Convert.ToBase64String(octets)
+ End Function
+
+End Class
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/HC_service_web" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/HC_service_web" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:complexType name="CompositeType">
- <xs:sequence>
- <xs:element minOccurs="0" name="BoolValue" type="xs:boolean" />
- <xs:element minOccurs="0" name="StringValue" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- <xs:element name="CompositeType" nillable="true" type="tns:CompositeType" />
-</xs:schema>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is automatically generated by Visual Studio .Net. It is
- used to store generic object data source configuration information.
- Renaming the file extension or editing the content of this file may
- cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="CompositeType" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>HobbyCartes.ServiceSecurite.CompositeType, Service References.ServiceSecurite.Reference.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="18bb70df-df1a-46f2-a251-ba13e6b30c46" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
- <ClientOptions>
- <GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
- <EnableDataBinding>true</EnableDataBinding>
- <ExcludedTypes />
- <ImportXmlTypes>false</ImportXmlTypes>
- <GenerateInternalTypes>false</GenerateInternalTypes>
- <GenerateMessageContracts>false</GenerateMessageContracts>
- <NamespaceMappings />
- <CollectionMappings />
- <GenerateSerializableTypes>true</GenerateSerializableTypes>
- <Serializer>Auto</Serializer>
- <UseSerializerForFaults>true</UseSerializerForFaults>
- <ReferenceAllAssemblies>true</ReferenceAllAssemblies>
- <ReferencedAssemblies />
- <ReferencedDataContractTypes />
- <ServiceContractMappings />
- </ClientOptions>
- <MetadataSources>
- <MetadataSource Address="http://localhost:8732/Design_Time_Addresses/Lise/Service1/mex" Protocol="mex" SourceId="1" />
- </MetadataSources>
- <Metadata>
- <MetadataFile FileName="service.wsdl" MetadataType="Wsdl" ID="1ceeb999-3c26-4c87-aa80-6a33b1b7847f" SourceId="1" SourceUrl="http://localhost:8732/Design_Time_Addresses/Lise/Service1/mex" />
- <MetadataFile FileName="service.xsd" MetadataType="Schema" ID="f60a92ae-e2b5-4efb-87b9-b56eb6f3ce13" SourceId="1" SourceUrl="http://localhost:8732/Design_Time_Addresses/Lise/Service1/mex" />
- <MetadataFile FileName="service1.xsd" MetadataType="Schema" ID="d5e5133f-2dd7-42ff-96dc-5da2224a32da" SourceId="1" SourceUrl="http://localhost:8732/Design_Time_Addresses/Lise/Service1/mex" />
- <MetadataFile FileName="HC_service_web.xsd" MetadataType="Schema" ID="ca284845-9480-4a27-afd3-4fc5cb6ecbcc" SourceId="1" SourceUrl="http://localhost:8732/Design_Time_Addresses/Lise/Service1/mex" />
- </Metadata>
- <Extensions>
- <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
- <ExtensionFile FileName="configuration.svcinfo" Name="configuration.svcinfo" />
- </Extensions>
-</ReferenceGroup>
Oops, something went wrong.

0 comments on commit 009a04a

Please sign in to comment.