Update login re for junos Evo and fix byte encoding issue (#229)

Co-authored-by: Robin Sinner <[email protected]>
knipknap · Aug 24, 2023 · 9d5b035 · 9d5b035
1 parent 0487a4a
commit 9d5b035
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Exscript/protocols/drivers/junos.py b/Exscript/protocols/drivers/junos.py
@@ -48,7 +48,7 @@
 #   pheller@fw1>
 #
 
-_user_re = [re.compile(r'[\r\n]login: $')]
+_user_re = [re.compile(r'[\r\n](?:[\-\w+]+ )?login: $')]
 _password_re = [re.compile(r'[\r\n](Local )?[Pp]assword: ?$')]
 _mb = r'(?:\{master(?::\d+)?\}|\{backup(?::\d+)?\})'
 _ps = r'(?:\{primary:node\d+\}|\{secondary:node\d+\})'

diff --git a/Exscript/protocols/telnetlib.py b/Exscript/protocols/telnetlib.py
@@ -483,6 +483,10 @@ def process_rawq(self):
                 # to perform, the indicated option.
                 elif command == DO:
                     opt = self.rawq_getchar()
+                    # int 0 produces an empty byte string which then has no ord
+                    # we can skip its processing
+                    if opt == b"":
+                        continue
                     self.msg('IAC DO %s', ord(opt))
                     if opt == TTYPE:
                         self.sock.send(IAC+WILL+opt)