Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Sep 1, 2016
1 parent 320e8ef commit dfde0d5
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 186 deletions.
26 changes: 13 additions & 13 deletions core/Banner.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/python
# -*- coding: latin-1 -*-
#HEADER#######################
# Katana framework #
# Splash File #
# Last Modified: 27/07/2016 #
# Review: 1 #
#######################HEADER#
#HEAD#########################################################
#
# Katana Framework | Banners
# Last Modified: 31/08/2016
#
#########################################################HEAD#

from core import colors,Information
from Function import get_number_modules,get_number_tools
Expand All @@ -15,13 +15,13 @@

Banner1="""
██╗ ██╗████████╗███████╗
██║ ██╔╝╚══██╔══╝██╔════╝
░░░░░░███████ ]▄▄▄▄▄█████╔╝ ██║ █████╗
▂▄▅█████████▅▄▃▂ ██╔═██╗ ██║ ██╔══╝
I█████████████████].██║ ██╗ ██║ ██║
◥⊙▲⊙▲⊙▲⊙▲⊙▲⊙▲⊙◤ ╚═╝ ╚═╝ ╚═╝ ╚═╝
The Hacking Framework
██╗ ██╗████████╗███████╗
██║ ██╔╝╚══██╔══╝██╔════╝
░░░░░░███████ ]▄▄▄▄▄█████╔╝ ██║ █████╗
▂▄▅█████████▅▄▃▂ ██╔═██╗ ██║ ██╔══╝
I█████████████████].██║ ██╗ ██║ ██║
◥⊙▲⊙▲⊙▲⊙▲⊙▲⊙▲⊙◤ ╚═╝ ╚═╝ ╚═╝ ╚═╝
The Hacking Framework
"""+colors.HH+""" Core """+colors.W+""" [ """+Information.version+""", Build: """+Information.build+""" ]
"""+colors.HH+""" Date """+colors.W+""" [ """+Information.date+""" ]
Expand Down
9 changes: 5 additions & 4 deletions core/Function.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#HEAD#########################################################
#
# Katana Framework | Function
# Last Modified: 23/08/2016
# Last Modified: 31/08/2016
#
#########################################################HEAD#

Expand Down Expand Up @@ -41,8 +41,10 @@ def UpdateValue(action,matriz):
for Namevalue in matriz.options:
if action[len(SETET)+1:len(SETET)+1+len(Namevalue)] == Namevalue:
checkValue=action[len(SETET)+2+len(Namevalue):]
if checkValue[0:4] == "::IP" : checkValue = VARIABLESIP[int(checkValue[4:])-1]
if checkValue[0:5] == "::MAC": checkValue = VARIABLESMAC[int(checkValue[5:])-1]
try:
if checkValue[0:4] == "::IP" : checkValue = VARIABLESIP[int(checkValue[4:])-1]
if checkValue[0:5] == "::MAC": checkValue = VARIABLESMAC[int(checkValue[5:])-1]
except:printAlert(6,"this value is recognized as an internal command but as it is not assigned to be used as value.")
ChangeValue(Namevalue,checkValue)
matriz.options[Namevalue] = [checkValue,matriz.options[Namevalue][1],matriz.options[Namevalue][2]]
return matriz
Expand Down Expand Up @@ -131,7 +133,6 @@ def Executefunction(query):
### CALL MODULE ###
def Invoke(module):
subprocess.Popen(["xterm","-T","Invoke["+module[len(INVOKE)+1:]+"]","-e","ktf.run","-m",module[len(INVOKE)+1:],"-q"])
#os.system("ktf.run -m "+module[len(INVOKE)+1:]+" -q")

### SHOW OPTIONS ###
def ShowOptions(Options):
Expand Down
1 change: 0 additions & 1 deletion core/logs/Errors.log
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

160 changes: 0 additions & 160 deletions lib/adb/adb.py

This file was deleted.

2 changes: 1 addition & 1 deletion lib/adb/adb/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import usb_exceptions

DEFAULT_TIMEOUT_MS = 1000
DEFAULT_TIMEOUT_MS = 10000

_LOG = logging.getLogger('android_usb')

Expand Down
14 changes: 7 additions & 7 deletions modules/clt/adb_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def init():
init.Description ="Console Client for ADB."
init.CodeName ="clt/cl.adb"
init.DateCreation ="18/08/2015"
init.LastModification ="18/08/2016"
init.LastModification ="31/08/2016"
init.References =None
init.License =KTF_LINCENSE
init.var ={}
Expand Down Expand Up @@ -66,11 +66,10 @@ def main(run):
HelpBanner = [["Commands","Description","Example"]]
HelpBanner += [["devices","list devices","devices"]]
HelpBanner += [["reboot","reboot device","reboot"]]
HelpBanner += [["shutdown","shutdown device","shutdown"]]
HelpBanner += [["push","push a file to the device","push /root/text.txt /sdcard"]]
HelpBanner += [["pull","pull a file from the device","pull /sdcard/text.txt /root/text.txt"]]
HelpBanner += [["push","push a file to the device","push /root/text.txt /text.txt"]]
HelpBanner += [["pull","pull a file from the device","pull /text.txt /root/text.txt"]]
HelpBanner += [["cd","browser directories","cd data"]]
HelpBanner += [["ls","list files","ls ./"]]
HelpBanner += [["ls","list files","ls"]]
MakeTable(HelpBanner)

cmd="nop"
Expand All @@ -79,7 +78,7 @@ def main(run):
while(cmd!="exit"):
main.command_name='list'
main.positional=[path]
main.auth_timeout_s=60.0
main.auth_timeout_s=600.0
main.timeout_ms=10000
main.device_path=None
main.rsa_key_path=[]
Expand All @@ -94,7 +93,7 @@ def main(run):
if cmd[3:] != "..": path+=cmd[3:]+"/"
if cmd[3:] == "..":
head, tail = os.path.split(os.path.split(path)[0])
path=str(head)
path=str(head)+"/"
main.positional=[path]
Execute(main)
if cmd[:2] == "ls":
Expand All @@ -118,6 +117,7 @@ def main(run):
main.method=adb_commands.AdbCommands.Reboot
Execute(main)
if cmd == "devices":print ListDevicesConnectADB()
if cmd[:3] == "cat":print "ver"
if cmd == "help" :MakeTable(HelpBanner)

# END CODE MODULE ###########################################################################################
Expand Down

0 comments on commit dfde0d5

Please sign in to comment.