Skip to content

Commit

Permalink
Fix tabs/spaces disaster
Browse files Browse the repository at this point in the history
  • Loading branch information
Grazfather committed Aug 27, 2017
1 parent fb0a169 commit 2e7cd20
Show file tree
Hide file tree
Showing 20 changed files with 862 additions and 866 deletions.
116 changes: 58 additions & 58 deletions addons/syscalls/syscallinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,84 +2,84 @@
import collections, os

class SyscallTable:
def __init__(self, filename):
self.source = filename
self.entries = collections.OrderedDict()
#self.identifiers = []
def __init__(self, filename):
self.source = filename
self.entries = collections.OrderedDict()
#self.identifiers = []

self.parse_table(filename)
self.parse_table(filename)

def getEntryDict(self, parts, identifiers):
entry = collections.OrderedDict()
def getEntryDict(self, parts, identifiers):
entry = collections.OrderedDict()

for i in range(len(parts)):
if identifiers[i] == "Definition":
parts[i] = parts[i].split(":")[0]

entry[identifiers[i]] = parts[i]
for i in range(len(parts)):
if identifiers[i] == "Definition":
parts[i] = parts[i].split(":")[0]

return entry
entry[identifiers[i]] = parts[i]

def parse_table(self, filename):
lines = []

with open(filename) as f:
lines = f.readlines()
return entry

# retrieve identifiers from first line
identifiers = lines[0].strip().split("\t")
def parse_table(self, filename):
lines = []

for line in lines[1:]:
parts = line.split("\t")
self.entries[parts[1]] = self.getEntryDict(line.split("\t"), identifiers)
with open(filename) as f:
lines = f.readlines()

def getEntryByID(self, idx):
for entry in self.entries:
if self.entries[entry]["#"] == str(idx):
return self.entries[entry]
# retrieve identifiers from first line
identifiers = lines[0].strip().split("\t")

return None
for line in lines[1:]:
parts = line.split("\t")
self.entries[parts[1]] = self.getEntryDict(line.split("\t"), identifiers)

def getEntryByName(self, name):
if name in self.entries:
return self.entries[name]
def getEntryByID(self, idx):
for entry in self.entries:
if self.entries[entry]["#"] == str(idx):
return self.entries[entry]

return None
return None

def getInfoMessage(self, entry):
if entry:
msg = ""

for part in entry:
msg += "{0:15} : {1}\n".format(part, entry[part])

return msg
def getEntryByName(self, name):
if name in self.entries:
return self.entries[name]

return None
return None

def getInfoMessageByID(self, idx):
entry = self.getEntryByID(idx)
return self.getInfoMessage(entry)
def getInfoMessage(self, entry):
if entry:
msg = ""

def getInfoMessageByName(self, name):
entry = self.getEntryByName(name)
return self.getInfoMessage(entry)
for part in entry:
msg += "{0:15} : {1}\n".format(part, entry[part])

return msg

return None

def getInfoMessageByID(self, idx):
entry = self.getEntryByID(idx)
return self.getInfoMessage(entry)

def getInfoMessageByName(self, name):
entry = self.getEntryByName(name)
return self.getInfoMessage(entry)


class SyscallInfo:
def __init__(self, basedir):
self.tables = {}
def __init__(self, basedir):
self.tables = {}

for table in os.listdir(basedir):
filename = os.path.join(basedir, table)
for table in os.listdir(basedir):
filename = os.path.join(basedir, table)

self.tables[table] = SyscallTable(filename)
self.tables[table] = SyscallTable(filename)

def getAvailableArchitectures(self):
return self.tables.keys()
def getAvailableArchitectures(self):
return self.tables.keys()

def getArch(self, arch):
if arch in self.tables:
return self.tables[arch]
def getArch(self, arch):
if arch in self.tables:
return self.tables[arch]

return None
return None
72 changes: 36 additions & 36 deletions bottypes/challenge.py
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
#!/usr/bin/env python3

class Challenge:
def __init__(self, channel_id, name):
"""
An object representation of an ongoing challenge.
channel_id : The slack id for the associated channel
name : The name of the challenge
"""
def __init__(self, channel_id, name):
"""
An object representation of an ongoing challenge.
channel_id : The slack id for the associated channel
name : The name of the challenge
"""

self.channel_id = channel_id
self.name = name
self.players = []
self.is_solved = False
self.solver = None
self.channel_id = channel_id
self.name = name
self.players = []
self.is_solved = False
self.solver = None

def mark_as_solved(self, solver_list):
"""
Mark a challenge as solved.
solver_list : List of usernames, that solved the challenge.
"""
self.is_solved = True
self.solver = solver_list
def mark_as_solved(self, solver_list):
"""
Mark a challenge as solved.
solver_list : List of usernames, that solved the challenge.
"""
self.is_solved = True
self.solver = solver_list

def unmark_as_solved(self):
"""
Unmark a challenge as solved.
"""
self.is_solved = False
self.solver = None
def unmark_as_solved(self):
"""
Unmark a challenge as solved.
"""
self.is_solved = False
self.solver = None

def add_player(self, player):
"""
Add a player to the list of working players
"""
if not any(p.user_id == player.user_id for p in self.players):
self.players.append(player)
def add_player(self, player):
"""
Add a player to the list of working players
"""
if not any(p.user_id == player.user_id for p in self.players):
self.players.append(player)

def remove_player(self, user_id):
"""
Remove a player from the list of working players
using a given slack user ID
"""
self.players = [player for player in self.players if player.user_id != user_id]
def remove_player(self, user_id):
"""
Remove a player from the list of working players
using a given slack user ID
"""
self.players = [player for player in self.players if player.user_id != user_id]
10 changes: 5 additions & 5 deletions bottypes/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from abc import ABC, abstractmethod

class Command(ABC):
"""
The command interface to be used
"""
def __init__(self): pass
def execute(self, slack_client, args, user_id, channel_id): pass
"""
The command interface to be used
"""
def __init__(self): pass
def execute(self, slack_client, args, user_id, channel_id): pass
10 changes: 5 additions & 5 deletions bottypes/command_descriptor.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
class CommandDesc():
def __init__(self, command, description, args, optArgs):
self.command = command
self.description = description
self.arguments = args
self.optionalArgs = optArgs
def __init__(self, command, description, args, optArgs):
self.command = command
self.description = description
self.arguments = args
self.optionalArgs = optArgs
32 changes: 16 additions & 16 deletions bottypes/ctf.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
#!/usr/bin/env python3

class CTF:
def __init__(self, channel_id, name):
"""
An object representation of an ongoing CTF.
channel_id : The slack id for the associated channel
name : The name of the CTF
"""
def __init__(self, channel_id, name):
"""
An object representation of an ongoing CTF.
channel_id : The slack id for the associated channel
name : The name of the CTF
"""

self.channel_id = channel_id
self.name = name
self.challenges = []
self.channel_id = channel_id
self.name = name
self.challenges = []

def add_challenge(self, challenge):
"""
Add a challenge object to the list of challenges belonging
to this CTF.
challenge : A challenge object
"""
self.challenges.append(challenge)
def add_challenge(self, challenge):
"""
Add a challenge object to the list of challenges belonging
to this CTF.
challenge : A challenge object
"""
self.challenges.append(challenge)
4 changes: 2 additions & 2 deletions bottypes/invalid_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

class InvalidCommand(Exception):
"""
Exception for invalid commands.
The message should be the usage for that command.
Exception for invalid commands.
The message should be the usage for that command.
"""
def __init__(self, message):
self.message = message
14 changes: 6 additions & 8 deletions bottypes/player.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
class Player:
"""
An object representation of a CTF player
"""

def __init__(self, user_id):
"""
user_id : The slack ID of a user
An object representation of a CTF player
"""
self.user_id = user_id


def __init__(self, user_id):
"""
user_id : The slack ID of a user
"""
self.user_id = user_id
8 changes: 4 additions & 4 deletions handlers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__all__ = [
"challenge_handler",
"syscalls_handler",
"bot_handler"
]
"challenge_handler",
"syscalls_handler",
"bot_handler"
]
Loading

0 comments on commit 2e7cd20

Please sign in to comment.