Skip to content

Commit

Permalink
changed setup.py; little fixies
Browse files Browse the repository at this point in the history
  • Loading branch information
merrychap committed Jan 25, 2018
1 parent 01bcaa9 commit 69d7eea
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 10 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
recursive-include shellen/syscalls *
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

setup(
name='shellen',
version='0.1.1',
version='0.1.6',
description='Interactive environment for crafting shellcodes. Also, it just can be used as a simple assembler/disassembler',
long_description=long_description,
url='https://github.com/merrychap/shellen',
Expand All @@ -33,8 +33,10 @@
'License :: OSI Approved :: MIT License',
'Intended Audience :: Information Technology'
],
keywords=['shellcode', 'pwn', 'assembler', 'disassembler'],
keywords=['shellcode', 'pwn', 'assembler', 'disassembler', 'syscalls'],
packages=['shellen', 'shellen/opt', 'shellen/asms', 'shellen/syscalls'],
include_package_data=True,
packge_data={'shellen/syscalls':['linux_tables/*.json']},
install_requires=['keystone-engine', 'capstone', 'colorama', 'termcolor', 'terminaltables'],
python_requires='>=3',
entry_points={
Expand Down
4 changes: 2 additions & 2 deletions shellen/asms/baseexc.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from archsconf import *
from opt.appearance import cprint, make_colors

from terminaltables import SingleTable
from terminaltables import SingleTable, AsciiTable, DoubleTable

from abc import ABC, abstractmethod

Expand Down Expand Up @@ -107,7 +107,7 @@ def archs(self):
for j in range(len(filtered)):
cur_row.append('' if i >= len(filtered[j]) else make_colors(filtered[j][i]))
table.append(cur_row)
rtable = SingleTable(table)
rtable = DoubleTable(table)
rtable.inner_heading_row_border = False
return rtable.table

Expand Down
3 changes: 2 additions & 1 deletion shellen/asms/disasm.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ def __init__(self, arch):

def print_res(self, res):
for line in res:
cprint("\t<cyan>0x{:08X}</>:\t<yellow,bold>{:<8}</><white,bold>{}</>".format(line.address, line.mnemonic, line.op_str))
cprint("\t<cyan>0x{:08X}</>:\t<yellow,bold>{:<8}</><white,bold>{}</>".format(line.address, line.mnemonic, line.op_str))
cprint('\n')
4 changes: 2 additions & 2 deletions shellen/fetcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from opt.appearance import cprint, make_colors

from terminaltables import SingleTable
from terminaltables import SingleTable, DoubleTable


SHELL_URL = 'http://shell-storm.org/api/?s={}'
Expand Down Expand Up @@ -73,7 +73,7 @@ def __get_colored_row(self, row):
def fetch_table(self, pattern, os='linux', arch=X86_32, count=0):
cprint('\n<magenta,bold>[*]</> Connecting to shell-storm.org...')
rowtable = self.fetch(pattern, os, arch, count, True)
return SingleTable(rowtable)
return DoubleTable(rowtable)

def sort_rows(self, table, count):
def bytes_len(row):
Expand Down
2 changes: 1 addition & 1 deletion shellen/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def dsm(self):
cprint('\n<green>[+]</> Changed to <white,underline>dsm</> (disassembly) mode\n')

def archs(self):
cprint(self.pexec.archs())
cprint('\n' + self.pexec.archs() + '\n')

def clear(self):
os.system('cls' if os.name == 'nt' else 'clear')
Expand Down
4 changes: 2 additions & 2 deletions shellen/syscalls/base_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from difflib import SequenceMatcher

from terminaltables import SingleTable
from terminaltables import SingleTable, DoubleTable


EMPTY_VALUE = '-'
Expand Down Expand Up @@ -53,7 +53,7 @@ def get_table(self, arch, pattern, colored=False, verbose=False):
value = command[hd]
cur_tb_field.append(self.__make_colored_field(value, hd, verbose=verbose))
table.append(cur_tb_field)
return SingleTable(table)
return DoubleTable(table)

def __make_colored_field(self, field, hd, verbose=False):
if hd == NAME_FIELD:
Expand Down

0 comments on commit 69d7eea

Please sign in to comment.