Provide procedure to wildcard clients

EmbeddedEnterprises · Jul 27, 2018 · 28bab3b · 28bab3b
1 parent 49e11a0
commit 28bab3b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/router/dealer.go b/router/dealer.go
@@ -627,7 +627,10 @@ func (d *Dealer) call(caller *session, msg *wamp.Call) {
 					Details: wamp.Dict{},
 					Error:   wamp.ErrOptionDisallowedDiscloseMe,
 				})
-			} else if callee.HasFeature(roleCallee, featureCallerIdent) {
+				// don't continue a call when discloseMe was disallowed.
+				return
+			}
+			if callee.HasFeature(roleCallee, featureCallerIdent) {
 				discloseCaller(caller, details)
 			}
 		}
@@ -644,6 +647,11 @@ func (d *Dealer) call(caller *session, msg *wamp.Call) {
 		}
 	}
 
+	if reg.match != wamp.MatchExact {
+		// according to the spec, a router has to provide the actual procedure to the client.
+		details[wamp.OptProcedure] = msg.Procedure
+	}
+
 	d.calls[msg.Request] = caller
 	invocationID := d.idGen.Next()
 	d.invocations[invocationID] = &invocation{

diff --git a/wamp/options.go b/wamp/options.go
@@ -11,6 +11,7 @@ const (
 	OptInvoke          = "invoke"
 	OptMatch           = "match"
 	OptMode            = "mode"
+	OptProcedure       = "procedure"
 	OptProgress        = "progress"
 	OptReceiveProgress = "receive_progress"
 	OptTimeout         = "timeout"