Update todo.md

changelog.md

@@ -0,0 +1,71 @@
+# 0.0.9 (Pre-Release)
+* Multi-server support (Progress: STARTING)
+* Full Chanserv support in `pawserv` plugin (Progress: PLANNED)
+* Dockerfile (Progress: PLANNED)
+
+# 0.0.7
+* The first stable release of IRCat (SweeNet stability is OK)
+* Implement IRC features:
+    * ISON
+    * TOPIC
+    * LIST (After new topic feature)
+    * KILL
+    * WEBIRC (For SweeNet webchat)
+    * RESTART
+* Implement IRCv3 features:
+    * Timestamps (`server-time`)
+    * Account indicator (`account-tag`)
+* Bare chanserv support on `pawserv` plugin
+* IRC operator support
+* Channel mode support
+* Fixed bugs:
+    * Mostly SSL issues
+    * Erroneus nicknames/channels
+    * Problems with NICK not being synced
+
+
+# 0.0.5
+* Ident support
+* Create plugins:
+    * Cloudflare D1 (`cfd1`)
+* Implement IRC features:
+    * LIST (bare support)
+* Rename GitServ to CatServ
+* Full nickserv support on `pawserv`
+* Fixed bugs:
+    * MOTD printed incorrectly
+    * Revolution IRC crashes on RPL_ISUPPORT
+
+# 0.0.4
+
+* Implement IRC features:
+    * NOTICE
+    * MOTD
+* Create plugins:
+    * Botnet filtering (`botnet_protect`)
+    * K-Lines (`ban_engine`)
+    * PawServ service bots (`pawserv`)
+* Create GitServ (External from `pawserv` plugin)
+* SSL support
+* And overall, a lot of bug fixes with the existing code.
+
+# 0.0.1
+* Create stable (Non-SSL) TCP sockets
+* Add YAML config
+* Create plugins:
+    * SQLite file (`sqlite_local`)
+* Implement IRC features:
+    * RPL_ISUPPORT
+    * PING
+    * CAP LS (IRCv3)
+    * PRIVMSG
+    * WHO
+    * NAMES
+    * JOIN/PART
+    * Bare MODE support (read-only user modes `+iw` and read-only channel modes `+nt`)
+    * NICK
+    * USER
+    * WHOIS
+    * AWAY
+    * QUIT
+* The very first version

server.py

@@ -1,8 +1,9 @@
 #!/usr/bin/python3
-__version__ = "0.0.7"
+__version__ = "0.0.9-pre"
 print(f"Codename IRCat v{__version__}")
 print("Welcome! /ᐠ ˵> ⩊ <˵マ")
 import socket, time, ssl, threading, traceback, sys, subprocess, yaml, sqlite3, os, importlib, datetime
+from cryptography.fernet import Fernet
 from requests import get
 if not len(sys.argv) == 2:
     print("IRCat requires the following arguments: config.yml")
@@ -109,6 +110,16 @@ with open(sys.argv[1], 'r') as file:
     except:
         print("IRCat needs at least one module enabled.")
         sys.exit(1)
+    try: multi_server = data["multiserver"]
+    except: multi_server = False
+    if multi_server:
+        if multi_server.__class__.__name__ != "list" and multi_server != "loner":
+            print("The multiserver option must be a list.")
+            sys.exit(1)
+        try: fnet = Fernet(data["fernet-key"])
+        except:
+            print("Multi-Server IRCat needs a Fernet key.")
+            sys.exit(1)
     file.close()
     print("Successfully loaded config!")
 for mod in modules:
@@ -167,7 +178,9 @@ nickname_list = {} # Stores nicknames and the respective sockets
 lower_nicks =   {"catserv": "CatServ"} # Nicknames in lowercase
 channel_modestore = {} # Channel: {nick: mode}
 channel_modestore_identify = {} # Channel: {account: mode}
-property_list = {"CatServ": {"host": "IRCatCore", "username": "Meow", "realname": "Updates bot", "modes": "iw", "away": False}} # Stores properties for active users and channels
+property_list = {"CatServ": {"host": server, "username": "system", "realname": "Updates bot (Internal)", "modes": "o", "away": False, "external": False}} # Stores properties for active users and channels
+users_externalservers = {} # Nicknames that come from different servers, useful in netsplit situations
+cache_properties = {} # Cached property lists from other servers, used to send out changes
 for i in mods['command']:
     requires = {}
     for j in i.__ircat_requires__:
@@ -206,6 +219,7 @@ if ssl_option:
         sockets_ssl[i].listen(1)
 opened=True
 lower_chans = {} # Channel names in lowercase
+sessions = {}
 #def pinger(nick, connection):
 #    global property_list
 #    while nick in property_list:
@@ -230,6 +244,56 @@ lower_chans = {} # Channel names in lowercase
 #                connection.shutdown(socket.SHUT_WR)
 #                connection.close()
 #                break
+def multiserverpinger(sock):
+    while True:
+        time.sleep(30)
+        sock.sendall(fnet.encrypt(bytes("PING", "UTF-8")))
+def multiserverhost(sock, client):
+    try:
+        threading.Thread(target=multiserverpinger, args=[sock]).start()
+        global sessions
+        global cache_properties
+        sessions[client[0]] = sock
+        cache_properties[client[0]] = {}
+        global channels_list
+        global property_list
+        global nickname_list
+        global topic_list
+        if sock.recv(2048).decode() == "meow":
+            sock.sendall(bytes("woem", "UTF-8"))
+        else:
+            raise Exception("This isn't an IRCat server!!")
+        while True:
+            txt = fnet.decrypt(sock.recv(2048)).decode()
+            if txt.split(" ")[0] == "VERIFYUSER": # When a user from a different server logs in
+                nck = txt.split(" ")[1] # Nickname
+                usr = json.loads(" ".join(txt.split(" ")[2:])) # New JSON properties
+                property_list[nck] = usr # Add the properties
+                nickname_list[nck] = {"external": client[0]} # Add the nickname indicating it's external
+                lower_nicks[nck.lower()] = usr # Add the lowercase nickname
+                users_externalservers[nck] = client[0] # Add to the list of external users
+            elif txt.split(" ")[0] == "SND": # When a token was sent by another server
+                nck = txt.split(" ")[1] # Nickname
+                cmd = txt.split(" ")[2] # Command
+                arg = txt.split(" ")[3:] # Arguments
+            elif txt.split(" ")[0] == "CNGPROP": # When properties changed on another server
+                nck = txt.split(" ")[1] # Nickname
+                usr = json.loads(" ".join(txt.split(" ")[2:])) # JSON
+                property_list[nck] = usr # Change the JSON...
+                cache_properties[client[0]][nck] = usr # ...And cache it
+            elif txt.split(" ")[0] == "CNGNICK": # When nick changed on another server
+                nck = txt.split(" ")[1] # Old nickname
+                nnck = txt.split(" ")[2] # New nickname
+                nickname_list[nnck] = nickname_list.pop(nck) # Move old nickname from list
+                property_list[nnck] = property_list.pop(nck) # Move properties...
+                cache_properties[client[0]][nnck] = cache_properties[client[0]].pop(nck) # ...And cache it
+                del lower_nicks[nck.lower()] # Remove the old lowercase nickname...
+                lower_nicks[nnck.lower()] = nnck # ...And replace it
+            elif txt == "PING":
+                sock.sendall(fnet.encrypt(bytes("PONG", "UTF-8")))
+    finally:
+        netsplit(client[0])
+        sock.close()
 def session(connection, client, ip, isssl=False):
     global channels_list
     global property_list
@@ -404,7 +468,7 @@ def session(connection, client, ip, isssl=False):
                         elif (ready and already_set) and (CAPEND if usesIRCv3 else True) and not finished:
                             print(f"User {pending} successfully logged in.")
                             nickname_list[pending] = connection
-                            property_list[pending] = {"host": hostname, "username": clident if clident != None else f"~{username }", "realname": realname, "modes": "iw", "away": False, "identified": False, "ssl": isssl, "v3cap": IRCv3Features, "last_ping": time.time(), "ping_pending": False, "pendingSend": ""}
+                            property_list[pending] = {"host": hostname, "username": clident if clident != None else f"~{username }", "realname": realname, "modes": "iw", "away": False, "identified": False, "ssl": isssl, "v3cap": IRCv3Features, "last_ping": time.time(), "ping_pending": False, "pendingSend": "", "external": False}
                             last_ping = time.time()
                             ping_pending = False
                             lower_nicks[pending.lower()] = pending

todo.md

@@ -1,28 +1,27 @@
 # To-Do list
 - [ ] Implement the base of an IRCd, using Libera.Chat and RFC1459 as a reference
-   -  [x] [Add the (full) connection process](https://mastodon.swee.codes/@swee/113659491393674897)
-   -  [x] Add join/part, and it's requirements (WHO, etc)
-   -  [x] Implement proper PRIVMSG
-   -  [x] Broadcast QUIT
-   -  [x] DNS lookup
-   -  [x] Identity management
+   -  [x] [Add the (full) connection process](https://mastodon.swee.codes/@swee/113659491393674897) (0.0.4)
+   -  [x] Add join/part, and it's requirements (WHO, etc) (0.0.1)
+   -  [x] Implement proper PRIVMSG (0.0.1)
+   -  [x] Broadcast QUIT (0.0.1)
+   -  [x] DNS lookup (0.0.1)
    -  [ ] WallOps
    -  [ ] Channel invite system
    -  [ ] Wildcard logic (for +b and +q)
-   -  [x] Send PING and wait for PONG
-   -  [x] Reply PONG if received PING
-   -  [x] [Change of nicknames](https://mastodon.swee.codes/@swee/113642104470536887)
-   -  [x] Away
+   -  [x] Send PING and wait for PONG (0.0.1)
+   -  [x] Reply PONG if received PING (0.0.1)
+   -  [x] [Change of nicknames](https://mastodon.swee.codes/@swee/113642104470536887) (0.0.1)
+   -  [x] Away (0.0.1)
    -  [ ] Multi-server support
-   -  [x] `LIST`
-   -  [x] `TOPIC`
+   -  [x] `LIST` (0.0.5)
+   -  [x] `TOPIC` (0.0.7)
 -  [ ] [Database support](https://discuss.swee.codes/t/41)
 -  [ ] User Flags
    -  [ ] i (invisible)
-   -  [x] o (IRCOP)
+   -  [x] o (IRCOP) (0.0.7)
    -  [ ] w (gets wallops)
 -  [ ] Channel Flags
-   -  [x] o \<user\> (CHANOP)
+   -  [x] o \<user\> (CHANOP) (0.0.7)
    -  [ ] v \<user\> (voice)
    -  [ ] m (moderated, only let voice or op talk)
    -  [ ] s (don't show in LIST)
@@ -39,30 +38,32 @@
 - [ ] Destructive features for IRCOPS
    -  [ ] `KILL <user> <comment>`
    -  [ ] `MODE <external user>`
-   -  [x] `RESTART`
+   -  [x] `RESTART` (0.07)
 - [ ] Extra commands
-   -  [x] `NAMES`
-   -  [x] `WHOIS`
+   -  [x] `NAMES` (0.0.1)
+   -  [x] `WHOIS` (0.0.1)
    -  [ ] `WHOWAS`
 - [ ] [Implement services.](modules/pawserv.py)
-   -  [x] Nickserv
+   -  [x] Nickserv (0.0.7)
    -  [ ] ChanServ
-   -  [x] CatServ (Outside of PawServ)
-   -  [x] Link `PRIVMSG *serv` to `*serv`
+   -  [x] CatServ (Outside of PawServ) (0.0.4)
+   -  [x] Link `PRIVMSG *serv` to `*serv` (0.0.4)
 - [x] Extra ~~(not planned)~~ features
-   -  [x] ident support
+   -  [x] ident support (0.0.5)
 - [x] Authentication
-   -  [x] Store credentials in ~~an SQLite3 file.~~ database engine
-   -  [x] Map NickServ IDENTIFY
-   -  [x] Map PASS
+   -  [x] Store credentials in ~~an SQLite3 file.~~ database engine (0.0.1)
+   -  [x] Map NickServ IDENTIFY (0.0.7)
+   -  [x] Map PASS (0.0.7)
 - [x] SSL/TLS
-   -  [x] [Use a thread to accept connections on SSL port 6697](https://mastodon.swee.codes/@swee/113762525145710774)
-   -  [x] Automatically reload the certificate ~~if defined in config.~~
+   -  [x] [Use a thread to accept connections on SSL port 6697](https://mastodon.swee.codes/@swee/113762525145710774) (0.0.1)
+   -  [x] Automatically reload the certificate ~~if defined in config.~~ (0.0.1)
 - [ ] Add IRCv3 features.
-   -  [x] List capabilities (`CAP LS 302`)
+   -  [x] List capabilities (`CAP LS 302`) (0.0.1)
    -  [ ] `away-notify`
    -  [ ] `tls` (STARTTLS)
    -  [ ] `sasl`
-   -  [x] `server-time`
+   -  [x] `server-time` (0.0.7)
+   -  [ ] `account-notify`
+   -  [x] `account-tag` (0.0.7)
    -  Will research later.
 I am going to fully read [RFC 1459](https://datatracker.ietf.org/doc/html/rfc1459) soon and add each part to the TODO.