#598: RPC method handle is asm+path+signature hash

dotnet-websharper · Aug 28, 2016 · d260127 · d260127
1 parent 4feb95d
commit d260127
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 16 deletions.
diff --git a/src/compiler/WebSharper.Compiler.CSharp/ProjectReader.fs b/src/compiler/WebSharper.Compiler.CSharp/ProjectReader.fs
@@ -280,8 +280,8 @@ let private transformClass (rcomp: CSharpCompilation) (sr: R.SymbolReader) (comp
             | Member.Override(_, _) -> error "Override method can't have Stub attribute"
             | Member.StaticConstructor -> error "Static constructor can't have Stub attribute"
         | Some (A.MemberKind.Remote rp) -> 
-            let def = sr.ReadMember meth
-            match def with
+            let memdef = sr.ReadMember meth
+            match memdef with
             | Member.Method (isInstance, mdef) ->
                 let remotingKind =
                     match mdef.Value.ReturnType with
@@ -291,7 +291,13 @@ let private transformClass (rcomp: CSharpCompilation) (sr: R.SymbolReader) (comp
                     | _ -> RemoteSync // TODO: warning
                 let isCsrfProtected t = true // TODO
                 let rp = rp |> Option.map (fun t -> t, isCsrfProtected t)
-                addMethod mAnnot mdef (N.Remote(remotingKind, comp.GetRemoteHandle(), rp)) true Undefined
+                let handle = 
+                    comp.GetRemoteHandle(
+                        def.Value.FullName + "." + mdef.Value.MethodName,
+                        mdef.Value.Parameters,
+                        mdef.Value.ReturnType
+                    )
+                addMethod mAnnot mdef (N.Remote(remotingKind, handle, rp)) true Undefined
             | _ -> error "Only methods can be defined Remote"
         | Some kind ->
             let meth = 

diff --git a/src/compiler/WebSharper.Compiler.FSharp/ProjectReader.fs b/src/compiler/WebSharper.Compiler.FSharp/ProjectReader.fs
@@ -261,7 +261,13 @@ let rec private transformClass (sc: Lazy<_ * StartupCode>) (comp: Compilation) (
                     | _ -> RemoteSync
                 let isCsrfProtected t = true // TODO
                 let rp = rp |> Option.map (fun t -> t, isCsrfProtected t)
-                addMethod (Some (meth, memdef)) mAnnot mdef (N.Remote(remotingKind, comp.GetRemoteHandle(), rp)) true Undefined
+                let handle = 
+                    comp.GetRemoteHandle(
+                        def.Value.FullName + "." + mdef.Value.MethodName,
+                        mdef.Value.Parameters,
+                        mdef.Value.ReturnType
+                    )
+                addMethod (Some (meth, memdef)) mAnnot mdef (N.Remote(remotingKind, handle, rp)) true Undefined
             | _ -> error "Only methods can be defined Remote"
         | _ -> ()
 

diff --git a/src/compiler/WebSharper.Compiler/Compilation.fs b/src/compiler/WebSharper.Compiler/Compilation.fs
@@ -54,7 +54,6 @@ type Compilation(meta: Info, ?hasGraph) =
     let warnings = ResizeArray() 
 
     let mutable entryPoint = None
-    let mutable remotingCode = -1
 
     let macros = System.Collections.Generic.Dictionary<TypeDefinition, Macro option>()
     let generators = System.Collections.Generic.Dictionary<TypeDefinition, Generator option>()
@@ -73,11 +72,11 @@ type Compilation(meta: Info, ?hasGraph) =
         | Some p -> p 
         | _ -> typ
 
-    member this.GetRemoteHandle() =
-        remotingCode <- remotingCode + 1
+    member this.GetRemoteHandle(path: string, args: Type list, ret: Type) =
         {
             Assembly = this.AssemblyName
-            Code = remotingCode
+            Path = path
+            SignatureHash = hash (args, ret)
         }
 
     member this.AddError (pos : SourcePos option, error : CompilationError) =

diff --git a/src/compiler/WebSharper.Core/Metadata.fs b/src/compiler/WebSharper.Core/Metadata.fs
@@ -35,17 +35,16 @@ type RemotingKind =
 type MethodHandle =
     {
         Assembly : string
-        Code : int
+        Path : string
+        SignatureHash : int
     }
     member this.Pack() =
-        string this.Assembly + ":" + string this.Code
+        this.Assembly + ":" + this.Path + ":" + string this.SignatureHash
 
     static member Unpack(s: string) =
         try
-            let i = s.LastIndexOf ':'
-            let code = int (s.Substring(i + 1))
-            let assembly = s.Substring(0, i)
-            { Assembly = assembly; Code = code }
+            let p = s.Split(':')
+            { Assembly = p.[0]; Path = p.[1]; SignatureHash = int p.[2] }
         with _ ->
             failwith "Failed to deserialize method handle"
 

diff --git a/src/compiler/WebSharper.Core/Remoting.fs b/src/compiler/WebSharper.Core/Remoting.fs
@@ -179,15 +179,22 @@ let IsRemotingRequest (h: Headers) =
         | _ -> false
 
 exception InvalidHeadersException
-exception NoRemoteAttributeException
+exception RemotingException of message: string with
+    override this.Message = this.message
 
 [<Sealed>]
 type Server(info, jP) =
     let remote = M.Utilities.getRemoteMethods info
+    let withoutHash = 
+        remote.Keys |> Seq.map (fun h -> h.Assembly, h.Path) |> HashSet
     let d = ConcurrentDictionary()
     let getConverter m =
         match remote.TryFind m with
-        | None -> raise NoRemoteAttributeException
+        | None ->
+            if withoutHash.Contains (m.Assembly, m.Path) then
+                raise (RemotingException ("Remote method signature incompatible: " + m.Path + ", " + m.Assembly))
+            else
+                raise (RemotingException ("Remote method not found: " + m.Path + ", " + m.Assembly))
         | Some (td, m) -> toConverter jP (AST.Reflection.LoadMethod td m)
     let getCachedConverter m =
         d.GetOrAdd(m, valueFactory = Func<_,_>(getConverter))