Merge branch 'development' of https://github.com/rushilwiz/SkoolOS into development

merges #
This commit is contained in:
Rushil Umaretiya 2020-06-16 11:57:04 -04:00
commit dc4a24cfa4
3 changed files with 18 additions and 9 deletions

View File

@ -92,16 +92,17 @@ def watch_dir(watched_dir="/tmp", logdir="/tmp/skooloslogs"):
logfile = open( logfile = open(
logdir + "/skoolos_" + logdir + "/skoolos_" +
time.strftime("%m%d%Y-%H%M%S", time.localtime()), 'w') time.strftime("%m%d%Y-%H%M%S", time.localtime()), 'w')
sys.stdout = logfile
START_TIME = time.time() START_TIME = time.time()
print("Start time: " +
time.strftime("%A, %B %d, %Y %H:%M:%S", time.localtime()) + "\n\n")
wm = pyinotify.WatchManager() wm = pyinotify.WatchManager()
mask = pyinotify.IN_CREATE | pyinotify.IN_CLOSE_WRITE | pyinotify.IN_DELETE | \ mask = pyinotify.IN_CREATE | pyinotify.IN_CLOSE_WRITE | pyinotify.IN_DELETE | \
pyinotify.IN_MOVED_TO | pyinotify.IN_MOVED_FROM | pyinotify.IN_OPEN pyinotify.IN_MOVED_TO | pyinotify.IN_MOVED_FROM | pyinotify.IN_OPEN
NOTIFIER = pyinotify.ThreadedNotifier(wm, EventHandler()) NOTIFIER = pyinotify.ThreadedNotifier(wm, EventHandler())
NOTIFIER.start() NOTIFIER.start()
sys.stdout = open("/dev/null", 'w')
wm.add_watch(watched_dir, mask, rec=True) wm.add_watch(watched_dir, mask, rec=True)
sys.stdout = logfile
print("Start time: " +
time.strftime("%A, %B %d, %Y %H:%M:%S", time.localtime()) + "\n")
def stop_watching(): def stop_watching():
@ -111,6 +112,7 @@ def stop_watching():
time.strftime("%A, %B %d, %Y %H:%M:%S", time.localtime())) time.strftime("%A, %B %d, %Y %H:%M:%S", time.localtime()))
print("\nTotal work time: " + print("\nTotal work time: " +
time.strftime("%H:%M:%S", time.gmtime(now - START_TIME))) time.strftime("%H:%M:%S", time.gmtime(now - START_TIME)))
print("\n" + checker.shell_check())
suspicious_files = checker.file_check(DIR) suspicious_files = checker.file_check(DIR)
if suspicious_files != []: if suspicious_files != []:
print( print(

View File

@ -75,19 +75,22 @@ def shell_check():
zsh_history = [ zsh_history = [
line.strip() for line in open(os.path.expanduser("~/.histfile"), 'r') line.strip() for line in open(os.path.expanduser("~/.histfile"), 'r')
] ]
report = "Suspicios commands found:\n" suspicious_commands = []
for i in bash_history + zsh_history: for i in bash_history + zsh_history:
if "git" in i: if "git" in i:
report += i + "\n" suspicious_commands.append(i)
if report != "Suspicios commands found:\n": if suspicious_commands != []:
return report return str(
len(suspicious_commands)
) + " suspicious commands found:\n" + "\n".join(suspicious_commands)
return "Nothing suspicious found in bash or zsh history." return "Nothing suspicious found in bash or zsh history."
def verify_file(file_): def verify_file(file_):
for ext in file_whitelist: for ext in file_whitelist:
if file_[len(file_) - len(ext):] == ext: if len(file_) > len(ext):
return True if file_[len(file_) - len(ext):] == ext:
return True
return False return False

4
bgservice/test.py Normal file
View File

@ -0,0 +1,4 @@
import bgservice as bg
bg.watch_dir()
input()
bg.stop_watching()