feat: remove deuteroui

ovisbot/db_models.py

@@ -81,7 +81,6 @@ class Challenge(EmbeddedMongoModel):
     attempted_by = fields.ListField(fields.CharField(), default=[])
     solved_at = fields.DateTimeField(blank=True)
     solved_by = fields.ListField(fields.CharField(), default=[], blank=True)
-    notebook_url = fields.CharField(default="", blank=True)
     flag = fields.CharField()
 
 

ovisbot/extensions/ctf/ctf.py

@@ -34,7 +34,6 @@
 )
 from ovisbot.helpers import (
     chunkify,
-    create_corimd_notebook,
     escape_md,
     failed,
     success,
@@ -197,7 +196,6 @@ async def addchallenge(self, ctx, challname, category):
             self.bot.user: discord.PermissionOverwrite(read_messages=True),
             ctx.message.author: discord.PermissionOverwrite(read_messages=True),
         }
-        notebook_url = create_corimd_notebook()
         challenge_channel = await ctx.channel.category.create_text_channel(
             channel_name + "-" + challenge_name, overwrites=overwrites
         )
@@ -206,16 +204,11 @@ async def addchallenge(self, ctx, challname, category):
             tags=[category],
             created_at=datetime.datetime.now(),
             attempted_by=[ctx.message.author.name],
-            notebook_url=notebook_url,
         )
         ctf.challenges.append(new_challenge)
         ctf.save()
         await success(ctx.message)
         await challenge_channel.send("@here Ατε να δούμε δώστου πίεση!")
-        notebook_msg = await challenge_channel.send(
-            f"Ετο τζαι το δευτερούι σου: {notebook_url}"
-        )
-        await notebook_msg.pin()
 
     @addchallenge.error
     async def addchallenge_error(self, ctx, error):
@@ -276,34 +269,6 @@ async def rmchallenge_error(self, ctx, error):
                 "Παρέα μου... εν κουτσιάς... Εν έσιει έτσι challenge!"
             )
 
-    @ctf.command()
-    async def notes(self, ctx):
-        """
-        Shows the notebook url for the particular challenge channel that you are currently in. If this command is run outside of a challenge channel, then ovis gets mad.
-        """
-        chall_name = ctx.channel.name
-        ctf = CTF.objects.get({"name": ctx.channel.category.name})
-
-        # Find challenge in CTF by name
-        challenge = next((c for c in ctf.challenges if c.name == chall_name), None)
-
-        if not challenge:
-            raise NotInChallengeChannelException
-
-        if challenge.notebook_url != "":
-            await ctx.channel.send(f"Notes: {challenge.notebook_url}")
-        else:
-            await ctx.channel.send("Εν έσσιει έτσι πράμα δαμέ...Τζίλα το...")
-
-    @notes.error
-    async def notes_error(self, ctx, error):
-        if isinstance(
-            error.original, (NotInChallengeChannelException, CTF.DoesNotExist)
-        ):
-            await ctx.channel.send(
-                "Ρε πελλοβρεμένε! For this command you have to be in a ctf challenge channel created by `!ctf addchallenge`."
-            )
-
     @ctf.command()
     @commands.has_permissions(manage_channels=True, manage_roles=True)
     async def finish(self, ctx, ctf_name):

ovisbot/extensions/utils/utils.py

@@ -1,12 +1,19 @@
 import logging
+from ovisbot.helpers import chunkify
 import struct
 import string
+import crypt
 
 from Crypto.Util.number import long_to_bytes, bytes_to_long
 from discord.ext import commands
 
 logger = logging.getLogger(__name__)
 
+def rotn_helper(offset, text):
+    shifted = string.ascii_lowercase[offset:] + string.ascii_lowercase[:offset] +\
+            string.ascii_uppercase[offset:] + string.ascii_uppercase[:offset]
+    shifted_tab = str.maketrans(string.ascii_letters, shifted)
+    return text.translate(shifted_tab)
 
 class Utils(commands.Cog):
     def __init__(self, bot):
@@ -53,14 +60,59 @@ async def hex2str(self, ctx, param):
 
     @utils.command()
     async def rotn(self, ctx, shift, *params):
-        shift = int(shift)
+        '''
+        Returns the ROT-n encoding of a message.
+        '''
         msg = ' '.join(params)
-        shifted = string.ascii_lowercase[shift:] + string.ascii_lowercase[:shift] +\
-                  string.ascii_uppercase[shift:] + string.ascii_uppercase[:shift]
-        shifted_tab = str.maketrans(string.ascii_letters, shifted)
-        shifted_str = msg.translate(shifted_tab)
-        await ctx.send(f"{msg} => {shifted_str}")
+        out = 'Original message:\n' + msg
+        if shift == "*":
+            for s in range(1, 14):
+                out += f'\n=[ ROT({s}) ]=\n'
+                out += rotn_helper(s, msg)
+        else:
+            shift = int(shift)
+            shifted_str = rotn_helper(shift, msg)
 
+            out += f'\n=[ ROT({shift}) ]=\n'
+            out += 'Encoded message:\n' + shifted_str 
+
+        for chunk in chunkify(out, 1700):
+            await ctx.send("".join(["```", chunk, "```"]))
+
+    @utils.command()
+    async def genshadow(self, ctx, cleartext, method = None):
+        '''
+        genshadow, generates a UNIX password hash and a corresponding /etc/shadow entry
+        and is intended for usage in boot2root environments
+
+        Available hash types:
+            + MD5
+            + Blowfish
+            + SHA-256
+            + SHA-512
+        '''
+        __methods = {
+            "1": crypt.METHOD_MD5,
+            "MD5": crypt.METHOD_MD5,
+
+            "2": crypt.METHOD_BLOWFISH,
+            "BLOWFISH": crypt.METHOD_BLOWFISH,
+
+            "5": crypt.METHOD_SHA256,
+            "SHA256": crypt.METHOD_SHA256,
+
+            "6": crypt.METHOD_SHA512,
+            "SHA512": crypt.METHOD_SHA512
+        }
+        if method and not method.isnumeric():
+            method = method.upper()
+        method = __methods.get(method, None)
+
+        unix_passwd = crypt.crypt(cleartext, method)
+        shadow = f"root:{unix_passwd}:0:0:99999:7::"
+        await ctx.send(f"{cleartext}:\n" +\
+                    f"=> {unix_passwd}\n" +\
+                    f"=> {shadow}")
 
 def setup(bot):
     bot.add_cog(Utils(bot))

ovisbot/helpers.py

@@ -21,13 +21,6 @@ def escape_md(text):
     return text.replace("_", "\_").replace("*", "\*").replace(">>>", "\>>>")
 
 
-def create_corimd_notebook():
-    base_url = "https://notes.status.im/"
-    create_new_note_url = base_url + "new"
-    res = requests.get(create_new_note_url)
-    return res.url
-
-
 def wolfram_simple_query(query, app_id):
     base_url = "https://api.wolframalpha.com/v2/result?i={0}&appid={1}"
     query_url = base_url.format(urllib.parse.quote(query), app_id)