home
·
contact
·
privacy
projects
/
plomlombot-irc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8bbb7d5
)
Add basic SASL authentication.
author
Christian Heller
<c.heller@plomlompom.de>
Wed, 26 May 2021 16:49:04 +0000
(18:49 +0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Wed, 26 May 2021 16:49:04 +0000
(18:49 +0200)
plomlombot.py
patch
|
blob
|
history
diff --git
a/plomlombot.py
b/plomlombot.py
index dc9a46d46b9b3be508ca70862982469fc16cee5a..1128eff61c757451ac80968dd74a1becfb85eed2 100755
(executable)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-471,8
+471,9
@@
def handle_url(url, notice, show_url=False):
class Session:
class Session:
- def __init__(self, io, username, nickname, channel, twtfile, dbdir, rmlogs,
+ def __init__(self, io, username, nickname,
sasl,
channel, twtfile, dbdir, rmlogs,
markov_input, no_show_page_titles):
markov_input, no_show_page_titles):
+ import base64
self.io = io
self.nickname = nickname
self.users_in_chan = []
self.io = io
self.nickname = nickname
self.users_in_chan = []
@@
-483,8
+484,16
@@
class Session:
self.markovfile = chandir + "markovfeed"
self.quotesfile = chandir + "quotes"
self.log = Log(chandir, self.nickname, username, channel, rmlogs)
self.markovfile = chandir + "markovfeed"
self.quotesfile = chandir + "quotes"
self.log = Log(chandir, self.nickname, username, channel, rmlogs)
+ if sasl:
+ self.io.send_line("CAP REQ :sasl")
self.io.send_line("NICK " + self.nickname)
self.io.send_line("USER " + username + " 0 * : ")
self.io.send_line("NICK " + self.nickname)
self.io.send_line("USER " + username + " 0 * : ")
+ if sasl:
+ self.io.send_line("AUTHENTICATE PLAIN")
+ auth = username + '\0' + username + '\0' + password
+ auth_encoded = base64.b64encode(auth.encode()).decode().rstrip()
+ self.io.send_line("AUTHENTICATE " + auth_encoded)
+ self.io.send_line("CAP END")
self.io.send_line("JOIN " + channel)
self.io.log = self.log
self.log.separator_line()
self.io.send_line("JOIN " + channel)
self.io.log = self.log
self.log.separator_line()
@@
-567,6
+576,8
@@
def parse_command_line_arguments():
parser.add_argument("-n, --nickname", action="store", dest="nickname",
default=NICKNAME, help="nickname to use (default: "
+ NICKNAME + ")")
parser.add_argument("-n, --nickname", action="store", dest="nickname",
default=NICKNAME, help="nickname to use (default: "
+ NICKNAME + ")")
+ parser.add_argument("-a, --authenticate", action="store", dest="sasl",
+ default=None, help="SASL password (default: none)")
parser.add_argument("-t, --twtxtfile", action="store", dest="twtfile",
default=TWTFILE, help="twtxt file to use (default: "
+ TWTFILE + ")")
parser.add_argument("-t, --twtxtfile", action="store", dest="twtfile",
default=TWTFILE, help="twtxt file to use (default: "
+ TWTFILE + ")")
@@
-592,7
+603,7
@@
while True:
io = IO(opts.server, opts.port, opts.timeout)
hash_server = hashlib.md5(opts.server.encode("utf-8")).hexdigest()
dbdir = opts.dbdir + "/" + hash_server
io = IO(opts.server, opts.port, opts.timeout)
hash_server = hashlib.md5(opts.server.encode("utf-8")).hexdigest()
dbdir = opts.dbdir + "/" + hash_server
- session = Session(io, opts.username, opts.nickname, opts.channel,
+ session = Session(io, opts.username, opts.nickname, opts.
sasl, opts.
channel,
opts.twtfile, dbdir, opts.rmlogs, opts.markov_store,
opts.no_show_page_titles)
session.loop()
opts.twtfile, dbdir, opts.rmlogs, opts.markov_store,
opts.no_show_page_titles)
session.loop()