Merge pull request #9 from rtrdev/master

Reordered Server authentication
mozes · Nov 7, 2015 · 887e164 · 887e164
2 parents 44fe0da + 5994fa7
commit 887e164
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/smpp/twisted/protocol.py b/smpp/twisted/protocol.py
@@ -771,14 +771,16 @@ def doBindRequest(self, reqPDU, sessionState):
         try:
             iface, auth_avatar, logout = yield self.factory.login(system_id, password, self.transport.getPeer().host)
         except error.UnauthorizedLogin:
-            if system_id not in self.factory.config.systems.keys():
-                self.log.warning('SMPP Bind request failed for system_id: "%s", System ID not configured' % system_id)
-                self.sendErrorResponse(reqPDU, CommandStatus.ESME_RINVSYSID, system_id)
-            else:
-                self.log.warning('SMPP Bind request failed for system_id: "%s", failed to authenticate' % system_id)
-                self.sendErrorResponse(reqPDU, CommandStatus.ESME_RINVPASWD, system_id)
+            self.log.warning('SMPP Bind request failed for system_id: "%s", failed to authenticate' % system_id)
+            self.sendErrorResponse(reqPDU, CommandStatus.ESME_RINVPASWD, system_id)
             return
 
+        # Only a configured system_id can bind
+        if system_id not in self.factory.config.systems.keys():
+            self.log.warning('SMPP Bind request failed for system_id: "%s", System ID not configured' % system_id)
+            self.sendErrorResponse(reqPDU, CommandStatus.ESME_RINVSYSID, system_id)
+            return 
+
         # Check we're not already bound, and are open to being bound
         if self.sessionState != SMPPSessionStates.OPEN:
             self.log.warning('Duplicate SMPP bind request received from: %s' % system_id)

diff --git a/smpp/twisted/tests/test_smpp_server.py b/smpp/twisted/tests/test_smpp_server.py
@@ -274,7 +274,7 @@ def testTRXBindRequestInvalidSysId(self):
             seqNum = 1
         )
         self.proto.dataReceived(self.encoder.encode(pdu))
-        expected_pdu = operations.BindTransceiverResp(system_id='userB', seqNum=1, status=pdu_types.CommandStatus.ESME_RINVSYSID)
+        expected_pdu = operations.BindTransceiverResp(system_id='userB', seqNum=1, status=pdu_types.CommandStatus.ESME_RINVPASWD)
         self.assertEqual(self.tr.value(), self.encoder.encode(expected_pdu))
         connection = self.factory.getBoundConnections('userA')
         self.assertEqual(connection, None)