Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to python3 #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Port to python3 #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d34f6da
Fix for passwords containing colons
rlaager Jan 27, 2019
09f1c7d
Update for Python 3
rlaager Jan 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions auth_mysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/python
#!/usr/bin/python3
#
#External auth script for ejabberd that enable auth against MySQL db with
#use of custom fields and table. It works with hashed passwords.
#Inspired by Lukas Kolbe script.
#Released under GNU GPLv3
#Requires Python 2
#Requires Python 3
#Author: iltl. Contact: [email protected]
#Author: Candid Dauth <[email protected]>
#Version: 2015-12-20
Expand Down Expand Up @@ -77,7 +77,7 @@ def __str__(self):
def ejabberd_in():
logging.debug("trying to read 2 bytes from ejabberd:")

input_length = sys.stdin.read(2)
input_length = sys.stdin.buffer.read(2)

if len(input_length) is not 2:
logging.debug("ejabberd sent us wrong things!")
Expand All @@ -88,7 +88,7 @@ def ejabberd_in():
(size,) = struct.unpack('>h', input_length)
logging.debug('size of data: %i'%size)

income=sys.stdin.read(size).split(':', 4)
income=sys.stdin.read(size)
logging.debug("incoming data: %s"%income)

return income
Expand All @@ -99,10 +99,10 @@ def ejabberd_out(bool):

token = genanswer(bool)

logging.debug("sent bytes: %#x %#x %#x %#x" % (ord(token[0]), ord(token[1]), ord(token[2]), ord(token[3])))
logging.debug("sent bytes: %#x %#x %#x %#x" % (token[0], token[1], token[2], token[3]))

sys.stdout.write(token)
sys.stdout.flush()
sys.stdout.buffer.write(token)
sys.stdout.buffer.flush()


def genanswer(bool):
Expand Down Expand Up @@ -211,15 +211,13 @@ def removeuser3(user, host, password):
logging.debug("start of infinite loop")

try:
ejab_request = ejabberd_in()
ejab_request = ejabberd_in().split(':', 3)
except EOFError:
break
except Exception as e:
logging.exception("Exception occured while reading stdin")
raise

logging.debug('operation: %s' % (":".join(ejab_request)))

op_result = False
try:
if ejab_request[0] == "auth":
Expand Down