added changed file struct for add modules OS #4

CHANGELOG

@@ -6,6 +6,7 @@ Version 1.3.2
 - added command "agents" for list all agents in session
 - added lock session when execute command as job
 - added option ssh key Authentication #3
+- added changed file struct for add modules OS #4
 
 Version 1.3.1
 =============

shell/b1tifi.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.7
 from os import path,mkdir
-from shell.core.consoleUI import Console
-from shell.core.utils.color import banner
+from shell.core.main import Console
+from shell.core.utility.color import banner
 version = '1.3.2'
 author  = 'Marcos Nesster (@mh4x0f)'
 def main():

shell/core/consoleUI.py → shell/core/common/console.py

@@ -18,24 +18,21 @@
 import argparse
 import cmd
 import shlex
-import sqlite3
 from os import system,path,getcwd
 from subprocess import check_output
 from re import search
 from tabulate import tabulate
-import shell.core.libs.secureSSH as SSHConnection
-from shell.core.utils import color
-import shell.core.utils.constants as C
+from shell.core.utility import color
+import shell.core.utility.constants as C
 
-class Console(cmd.Cmd):
-    def __init__(self,db_path):
+class ConsoleUI(cmd.Cmd):
+    def __init__(self,settings,ssh_session=None, dcon=dict):
         cmd.Cmd.__init__(self)
         self.prompt = color.setcolor('b1tifi:: ', color='Blue')
-        self.con    = sqlite3.connect(db_path)
-        self.db     = self.con.cursor()
-        self.db.execute(C.createTables)
-        self.settings   = {'all' :{},'check' :[],'agents':{}}
-        self.sshConnect = SSHConnection
+        self.settings   = settings
+        self.db         = dcon['db_cursor']
+        self.con        = dcon['db_con']
+        self.sshConnect = ssh_session
         self.search_all_agents()
 
     def do_list(self,args):

shell/core/libs/secureSSH.py → shell/core/connection/ssh.py

@@ -21,8 +21,8 @@
 from datetime import datetime
 from pexpect import pxssh
 from os import path
-from shell.core.utils.threads import Thread_Jobs
-from shell.core.utils.color import setcolor,display_messages
+from shell.core.utility.threads import Thread_Jobs
+from shell.core.utility.color import setcolor,display_messages
 
 class ssh(object):
     def __init__(self, host,port, user, password,checkconnect=True):

shell/core/main.py

@@ -0,0 +1,35 @@
+import sqlite3
+import shell.core.connection.ssh as SSHConnection
+from shell.core.common.console import ConsoleUI
+import shell.core.utility.constants as C
+
+class Console(ConsoleUI):
+    ''' main class console UI'''
+    def __init__(self,path):
+        self.load_database(path)
+        self.ssh        = SSHConnection
+        self.settings   = {'all' :{},'check' :[],'agents':{}}
+        ConsoleUI.__init__(self,self.settings,self.ssh, {'db_con': self.con, 'db_cursor': self.db})
+
+    def load_database(self, path):
+        self.con    = sqlite3.connect(path)
+        self.db     = self.con.cursor()
+        self.db.execute(C.createTables)
+
+    def do_modules(self, args):
+        ''' show all modules '''
+        pass
+
+    def precmd(self, line):
+        newline=line.strip()
+        is_cmt=newline.startswith('#')
+        if is_cmt:
+            return ('')
+        return (line)
+
+    def postcmd(self, stop, line):
+        return stop
+
+    def emptyline(self):
+        """Do nothing on empty input line"""
+        pass

shell/core/utils/threads.py → shell/core/utility/threads.py

@@ -1,5 +1,5 @@
 import threading
-from shell.core.utils.color import display_messages
+from shell.core.utility.color import display_messages
 class Thread_Jobs(threading.Thread):
     def __init__(self,cmd,session):
         threading.Thread.__init__(self)