regen fbs; work on catalogs; bump dev version (#1581)

* regen fbs; work on catalogs; bump dev version
* more cryptosign tests
* add SecurityModuleMemory.from_config; add tests; moved UserKey from crossbar to autobahn.xbr._userkey
* update changelog

MANIFEST.in

@@ -5,3 +5,4 @@ recursive-include autobahn/wamp/gen/schema *
 recursive-include autobahn/asset *
 recursive-include autobahn/xbr/templates *
 recursive-include autobahn/xbr/test/catalog/schema *
+recursive-include autobahn/xbr/test/profile *

autobahn/_version.py

@@ -24,6 +24,6 @@
 #
 ###############################################################################
 
-__version__ = '22.6.1.dev1'
+__version__ = '22.6.1.dev2'
 
 __build__ = '00000000-0000000'

autobahn/wamp/cryptosign.py

@@ -518,7 +518,7 @@ def sign_challenge(self, session: ISession, challenge: Challenge,
                 'unexpected cryptosign challenge with method "{}"'.format(challenge.method)
 
             # get the TLS channel ID of the underlying TLS connection
-            if channel_id_type in session._transport.transport_details.channel_id:
+            if channel_id_type and channel_id_type in session._transport.transport_details.channel_id:
                 channel_id = session._transport.transport_details.channel_id.get(channel_id_type, None)
             else:
                 channel_id_type = None

autobahn/wamp/gen/wamp/Map.py

@@ -38,19 +38,15 @@ def Value(self):
             return self._tab.String(o + self._tab.Pos)
         return None
 
-def Start(builder): builder.StartObject(2)
-def MapStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def AddKey(builder, key): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(key), 0)
-def MapAddKey(builder, key):
-    """This method is deprecated. Please switch to AddKey."""
-    return AddKey(builder, key)
-def AddValue(builder, value): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0)
-def MapAddValue(builder, value):
-    """This method is deprecated. Please switch to AddValue."""
-    return AddValue(builder, value)
-def End(builder): return builder.EndObject()
-def MapEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def MapStart(builder): builder.StartObject(2)
+def Start(builder):
+    return MapStart(builder)
+def MapAddKey(builder, key): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(key), 0)
+def AddKey(builder, key):
+    return MapAddKey(builder, key)
+def MapAddValue(builder, value): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0)
+def AddValue(builder, value):
+    return MapAddValue(builder, value)
+def MapEnd(builder): return builder.EndObject()
+def End(builder):
+    return MapEnd(builder)

autobahn/wamp/gen/wamp/Void.py

@@ -24,11 +24,9 @@ def GetRootAsVoid(cls, buf, offset=0):
     def Init(self, buf, pos):
         self._tab = flatbuffers.table.Table(buf, pos)
 
-def Start(builder): builder.StartObject(0)
-def VoidStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def End(builder): return builder.EndObject()
-def VoidEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def VoidStart(builder): builder.StartObject(0)
+def Start(builder):
+    return VoidStart(builder)
+def VoidEnd(builder): return builder.EndObject()
+def End(builder):
+    return VoidEnd(builder)

autobahn/wamp/gen/wamp/proto/Abort.py

@@ -38,19 +38,15 @@ def Message(self):
             return self._tab.String(o + self._tab.Pos)
         return None
 
-def Start(builder): builder.StartObject(2)
-def AbortStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def AddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0)
-def AbortAddReason(builder, reason):
-    """This method is deprecated. Please switch to AddReason."""
-    return AddReason(builder, reason)
-def AddMessage(builder, message): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(message), 0)
-def AbortAddMessage(builder, message):
-    """This method is deprecated. Please switch to AddMessage."""
-    return AddMessage(builder, message)
-def End(builder): return builder.EndObject()
-def AbortEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AbortStart(builder): builder.StartObject(2)
+def Start(builder):
+    return AbortStart(builder)
+def AbortAddReason(builder, reason): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(reason), 0)
+def AddReason(builder, reason):
+    return AbortAddReason(builder, reason)
+def AbortAddMessage(builder, message): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(message), 0)
+def AddMessage(builder, message):
+    return AbortAddMessage(builder, message)
+def AbortEnd(builder): return builder.EndObject()
+def End(builder):
+    return AbortEnd(builder)

autobahn/wamp/gen/wamp/proto/AnyMessage.py

@@ -30,4 +30,3 @@ class AnyMessage(object):
     Invocation = 24
     Interrupt = 25
     Yield = 26
-

autobahn/wamp/gen/wamp/proto/AuthCraChallenge.py

@@ -52,27 +52,21 @@ def Keylen(self):
             return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
         return 32
 
-def Start(builder): builder.StartObject(4)
-def AuthCraChallengeStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def AddChallenge(builder, challenge): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(challenge), 0)
-def AuthCraChallengeAddChallenge(builder, challenge):
-    """This method is deprecated. Please switch to AddChallenge."""
-    return AddChallenge(builder, challenge)
-def AddSalt(builder, salt): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(salt), 0)
-def AuthCraChallengeAddSalt(builder, salt):
-    """This method is deprecated. Please switch to AddSalt."""
-    return AddSalt(builder, salt)
-def AddIterations(builder, iterations): builder.PrependUint32Slot(2, iterations, 1000)
-def AuthCraChallengeAddIterations(builder, iterations):
-    """This method is deprecated. Please switch to AddIterations."""
-    return AddIterations(builder, iterations)
-def AddKeylen(builder, keylen): builder.PrependUint8Slot(3, keylen, 32)
-def AuthCraChallengeAddKeylen(builder, keylen):
-    """This method is deprecated. Please switch to AddKeylen."""
-    return AddKeylen(builder, keylen)
-def End(builder): return builder.EndObject()
-def AuthCraChallengeEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AuthCraChallengeStart(builder): builder.StartObject(4)
+def Start(builder):
+    return AuthCraChallengeStart(builder)
+def AuthCraChallengeAddChallenge(builder, challenge): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(challenge), 0)
+def AddChallenge(builder, challenge):
+    return AuthCraChallengeAddChallenge(builder, challenge)
+def AuthCraChallengeAddSalt(builder, salt): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(salt), 0)
+def AddSalt(builder, salt):
+    return AuthCraChallengeAddSalt(builder, salt)
+def AuthCraChallengeAddIterations(builder, iterations): builder.PrependUint32Slot(2, iterations, 1000)
+def AddIterations(builder, iterations):
+    return AuthCraChallengeAddIterations(builder, iterations)
+def AuthCraChallengeAddKeylen(builder, keylen): builder.PrependUint8Slot(3, keylen, 32)
+def AddKeylen(builder, keylen):
+    return AuthCraChallengeAddKeylen(builder, keylen)
+def AuthCraChallengeEnd(builder): return builder.EndObject()
+def End(builder):
+    return AuthCraChallengeEnd(builder)

autobahn/wamp/gen/wamp/proto/AuthCraRequest.py

@@ -24,11 +24,9 @@ def GetRootAsAuthCraRequest(cls, buf, offset=0):
     def Init(self, buf, pos):
         self._tab = flatbuffers.table.Table(buf, pos)
 
-def Start(builder): builder.StartObject(0)
-def AuthCraRequestStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def End(builder): return builder.EndObject()
-def AuthCraRequestEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AuthCraRequestStart(builder): builder.StartObject(0)
+def Start(builder):
+    return AuthCraRequestStart(builder)
+def AuthCraRequestEnd(builder): return builder.EndObject()
+def End(builder):
+    return AuthCraRequestEnd(builder)

autobahn/wamp/gen/wamp/proto/AuthCraWelcome.py

@@ -24,11 +24,9 @@ def GetRootAsAuthCraWelcome(cls, buf, offset=0):
     def Init(self, buf, pos):
         self._tab = flatbuffers.table.Table(buf, pos)
 
-def Start(builder): builder.StartObject(0)
-def AuthCraWelcomeStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def End(builder): return builder.EndObject()
-def AuthCraWelcomeEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AuthCraWelcomeStart(builder): builder.StartObject(0)
+def Start(builder):
+    return AuthCraWelcomeStart(builder)
+def AuthCraWelcomeEnd(builder): return builder.EndObject()
+def End(builder):
+    return AuthCraWelcomeEnd(builder)

autobahn/wamp/gen/wamp/proto/AuthCryptosignChallenge.py

@@ -31,15 +31,12 @@ def ChannelBinding(self):
             return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
         return 0
 
-def Start(builder): builder.StartObject(1)
-def AuthCryptosignChallengeStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def AddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(0, channelBinding, 0)
-def AuthCryptosignChallengeAddChannelBinding(builder, channelBinding):
-    """This method is deprecated. Please switch to AddChannelBinding."""
-    return AddChannelBinding(builder, channelBinding)
-def End(builder): return builder.EndObject()
-def AuthCryptosignChallengeEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AuthCryptosignChallengeStart(builder): builder.StartObject(1)
+def Start(builder):
+    return AuthCryptosignChallengeStart(builder)
+def AuthCryptosignChallengeAddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(0, channelBinding, 0)
+def AddChannelBinding(builder, channelBinding):
+    return AuthCryptosignChallengeAddChannelBinding(builder, channelBinding)
+def AuthCryptosignChallengeEnd(builder): return builder.EndObject()
+def End(builder):
+    return AuthCryptosignChallengeEnd(builder)

autobahn/wamp/gen/wamp/proto/AuthCryptosignRequest.py

@@ -38,19 +38,15 @@ def ChannelBinding(self):
             return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
         return 0
 
-def Start(builder): builder.StartObject(2)
-def AuthCryptosignRequestStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def AddPubkey(builder, pubkey): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pubkey), 0)
-def AuthCryptosignRequestAddPubkey(builder, pubkey):
-    """This method is deprecated. Please switch to AddPubkey."""
-    return AddPubkey(builder, pubkey)
-def AddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(1, channelBinding, 0)
-def AuthCryptosignRequestAddChannelBinding(builder, channelBinding):
-    """This method is deprecated. Please switch to AddChannelBinding."""
-    return AddChannelBinding(builder, channelBinding)
-def End(builder): return builder.EndObject()
-def AuthCryptosignRequestEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AuthCryptosignRequestStart(builder): builder.StartObject(2)
+def Start(builder):
+    return AuthCryptosignRequestStart(builder)
+def AuthCryptosignRequestAddPubkey(builder, pubkey): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pubkey), 0)
+def AddPubkey(builder, pubkey):
+    return AuthCryptosignRequestAddPubkey(builder, pubkey)
+def AuthCryptosignRequestAddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(1, channelBinding, 0)
+def AddChannelBinding(builder, channelBinding):
+    return AuthCryptosignRequestAddChannelBinding(builder, channelBinding)
+def AuthCryptosignRequestEnd(builder): return builder.EndObject()
+def End(builder):
+    return AuthCryptosignRequestEnd(builder)

autobahn/wamp/gen/wamp/proto/AuthCryptosignWelcome.py

@@ -24,11 +24,9 @@ def GetRootAsAuthCryptosignWelcome(cls, buf, offset=0):
     def Init(self, buf, pos):
         self._tab = flatbuffers.table.Table(buf, pos)
 
-def Start(builder): builder.StartObject(0)
-def AuthCryptosignWelcomeStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def End(builder): return builder.EndObject()
-def AuthCryptosignWelcomeEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AuthCryptosignWelcomeStart(builder): builder.StartObject(0)
+def Start(builder):
+    return AuthCryptosignWelcomeStart(builder)
+def AuthCryptosignWelcomeEnd(builder): return builder.EndObject()
+def End(builder):
+    return AuthCryptosignWelcomeEnd(builder)

autobahn/wamp/gen/wamp/proto/AuthFactor.py

@@ -8,4 +8,3 @@ class AuthFactor(object):
     AuthCraRequest = 2
     AuthScramRequest = 3
     AuthCryptosignRequest = 4
-

autobahn/wamp/gen/wamp/proto/AuthMethod.py

@@ -10,4 +10,3 @@ class AuthMethod(object):
     CRA = 4
     SCRAM = 5
     CRYPTOSIGN = 6
-

autobahn/wamp/gen/wamp/proto/AuthMode.py

@@ -5,4 +5,3 @@
 class AuthMode(object):
     FIRST = 0
     MULTIFACTOR = 1
-

autobahn/wamp/gen/wamp/proto/AuthScramChallenge.py

@@ -66,35 +66,27 @@ def ChannelBinding(self):
             return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
         return 0
 
-def Start(builder): builder.StartObject(6)
-def AuthScramChallengeStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def AddNonce(builder, nonce): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(nonce), 0)
-def AuthScramChallengeAddNonce(builder, nonce):
-    """This method is deprecated. Please switch to AddNonce."""
-    return AddNonce(builder, nonce)
-def AddSalt(builder, salt): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(salt), 0)
-def AuthScramChallengeAddSalt(builder, salt):
-    """This method is deprecated. Please switch to AddSalt."""
-    return AddSalt(builder, salt)
-def AddKdf(builder, kdf): builder.PrependUint8Slot(2, kdf, 2)
-def AuthScramChallengeAddKdf(builder, kdf):
-    """This method is deprecated. Please switch to AddKdf."""
-    return AddKdf(builder, kdf)
-def AddIterations(builder, iterations): builder.PrependUint32Slot(3, iterations, 0)
-def AuthScramChallengeAddIterations(builder, iterations):
-    """This method is deprecated. Please switch to AddIterations."""
-    return AddIterations(builder, iterations)
-def AddMemory(builder, memory): builder.PrependUint32Slot(4, memory, 0)
-def AuthScramChallengeAddMemory(builder, memory):
-    """This method is deprecated. Please switch to AddMemory."""
-    return AddMemory(builder, memory)
-def AddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(5, channelBinding, 0)
-def AuthScramChallengeAddChannelBinding(builder, channelBinding):
-    """This method is deprecated. Please switch to AddChannelBinding."""
-    return AddChannelBinding(builder, channelBinding)
-def End(builder): return builder.EndObject()
-def AuthScramChallengeEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AuthScramChallengeStart(builder): builder.StartObject(6)
+def Start(builder):
+    return AuthScramChallengeStart(builder)
+def AuthScramChallengeAddNonce(builder, nonce): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(nonce), 0)
+def AddNonce(builder, nonce):
+    return AuthScramChallengeAddNonce(builder, nonce)
+def AuthScramChallengeAddSalt(builder, salt): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(salt), 0)
+def AddSalt(builder, salt):
+    return AuthScramChallengeAddSalt(builder, salt)
+def AuthScramChallengeAddKdf(builder, kdf): builder.PrependUint8Slot(2, kdf, 2)
+def AddKdf(builder, kdf):
+    return AuthScramChallengeAddKdf(builder, kdf)
+def AuthScramChallengeAddIterations(builder, iterations): builder.PrependUint32Slot(3, iterations, 0)
+def AddIterations(builder, iterations):
+    return AuthScramChallengeAddIterations(builder, iterations)
+def AuthScramChallengeAddMemory(builder, memory): builder.PrependUint32Slot(4, memory, 0)
+def AddMemory(builder, memory):
+    return AuthScramChallengeAddMemory(builder, memory)
+def AuthScramChallengeAddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(5, channelBinding, 0)
+def AddChannelBinding(builder, channelBinding):
+    return AuthScramChallengeAddChannelBinding(builder, channelBinding)
+def AuthScramChallengeEnd(builder): return builder.EndObject()
+def End(builder):
+    return AuthScramChallengeEnd(builder)

autobahn/wamp/gen/wamp/proto/AuthScramRequest.py

@@ -38,19 +38,15 @@ def ChannelBinding(self):
             return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
         return 0
 
-def Start(builder): builder.StartObject(2)
-def AuthScramRequestStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def AddNonce(builder, nonce): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(nonce), 0)
-def AuthScramRequestAddNonce(builder, nonce):
-    """This method is deprecated. Please switch to AddNonce."""
-    return AddNonce(builder, nonce)
-def AddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(1, channelBinding, 0)
-def AuthScramRequestAddChannelBinding(builder, channelBinding):
-    """This method is deprecated. Please switch to AddChannelBinding."""
-    return AddChannelBinding(builder, channelBinding)
-def End(builder): return builder.EndObject()
-def AuthScramRequestEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
+def AuthScramRequestStart(builder): builder.StartObject(2)
+def Start(builder):
+    return AuthScramRequestStart(builder)
+def AuthScramRequestAddNonce(builder, nonce): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(nonce), 0)
+def AddNonce(builder, nonce):
+    return AuthScramRequestAddNonce(builder, nonce)
+def AuthScramRequestAddChannelBinding(builder, channelBinding): builder.PrependUint8Slot(1, channelBinding, 0)
+def AddChannelBinding(builder, channelBinding):
+    return AuthScramRequestAddChannelBinding(builder, channelBinding)
+def AuthScramRequestEnd(builder): return builder.EndObject()
+def End(builder):
+    return AuthScramRequestEnd(builder)