# HG changeset patch # User Oliver Maurhart # Date 1403721612 -7200 # Node ID c007fc48f81227ddbbfdb44b032f57feb62def5b # Parent 74e42f671ec4e77ed1cbc5fce3ba92ce30d25c8e# Parent 26b9a95b0da1c1b398efd6a9c778b3c5def5d208 merge diff -r 74e42f671ec4 -r c007fc48f812 OpenSecurity.iss --- a/OpenSecurity.iss Wed Jun 25 20:39:42 2014 +0200 +++ b/OpenSecurity.iss Wed Jun 25 20:40:12 2014 +0200 @@ -35,6 +35,7 @@ Source: "OpenSecurity\python27\Lib\site-packages\pywin32_system32\pywintypes27.dll"; DestDir: "{sys}"; Flags: sharedfile; Source: "OpenSecurity\systemprofile\.VirtualBox\*"; DestDir: "{sys}\config\systemprofile\.VirtualBox"; Flags: recursesubdirs createallsubdirs; Source: "OpenSecurity\systemprofile\VirtualBox VMs\*"; DestDir: "{sys}\config\systemprofile\VirtualBox VMs"; Flags: recursesubdirs createallsubdirs; +Source: "OpenSecurity\Apache License, Version 2.0.txt"; DestDir: "{app}"; [Dirs] Name: "{app}\cygwin64\var\log\xwin"; Permissions: everyone-modify @@ -49,6 +50,8 @@ [Icons] ; Program Icons in start menu Name: "{group}\OpenSecurity Tray Icon"; Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Comment: "The OpenSecurity Tray Icon"; IconFilename: "{app}\bin\ui\gfx\OpenSecurity.ico" +Name: "{group}\Secure Browsing"; Filename: "{app}\cygiwn64\bin\wget.exe"; Parameters: """http://localhost:8080/browsing"""; WorkingDir: "{userappdata}"; Comment: "OpenSecurity Secure Browsing"; IconFilename: "{app}\bin\ui\gfx\opensecurity_browsing_64.ico" +Name: "{commondesktop}\Secure Browsing"; Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\start_browsing.pyw"""; WorkingDir: "{userappdata}"; Comment: "OpenSecurity Secure Browsing"; IconFilename: "{app}\bin\ui\gfx\opensecurity_browsing_64.ico" Name: "{group}\Uninstall OpenSecurity"; Filename: "{uninstallexe}" [Run] diff -r 74e42f671ec4 -r c007fc48f812 OpenSecurity/bin/opensecurity_tray.pyw --- a/OpenSecurity/bin/opensecurity_tray.pyw Wed Jun 25 20:39:42 2014 +0200 +++ b/OpenSecurity/bin/opensecurity_tray.pyw Wed Jun 25 20:40:12 2014 +0200 @@ -117,7 +117,6 @@ except: - d.hide() QtGui.QApplication.instance().processEvents() QtGui.QMessageBox.critical(None, 'Failed to invoke Safe Internet Browsing', 'OpenSecurity Error') diff -r 74e42f671ec4 -r c007fc48f812 OpenSecurity/bin/start_browsing.pyw --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OpenSecurity/bin/start_browsing.pyw Wed Jun 25 20:40:12 2014 +0200 @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- + +# ------------------------------------------------------------ +# directly start the browsing +# +# Autor: Oliver Maurhart, +# +# Copyright (C) 2013 AIT Austrian Institute of Technology +# AIT Austrian Institute of Technology GmbH +# Donau-City-Strasse 1 | 1220 Vienna | Austria +# http://www.ait.ac.at +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation version 2. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# ------------------------------------------------------------ + + +# ------------------------------------------------------------ +# imports + +import sys +import urllib +import urllib2 + +from PyQt4 import QtCore +from PyQt4 import QtGui + +# local +import __init__ as opensecurity + +if sys.platform == 'win32' or sys.platform == 'cygwin': + from cygwin import Cygwin + + +# ------------------------------------------------------------ +# code + + +# start +if __name__ == "__main__": + + if not (sys.platform == 'win32' or sys.platform == 'cygwin'): + QtGui.QMessageBox.critical(self.parent(), 'OpenSecurity Error', 'This action is not supported on this platform.\nSorry.') + sys.exit(1) + + try: + + # get a proper browsing VM + Cygwin.start_X11() + + # TODO: HARDCODED ADDRESS OF OPENSECURITYD + browsing_vm = urllib2.urlopen('http://127.0.0.1:8080/browsing').readline() + print('Called http://127.0.0.1:8080/browsing got: ' + str(browsing_vm)) + + except: + + QtGui.QApplication.instance().processEvents() + QtGui.QMessageBox.critical(None, 'Failed to invoke Safe Internet Browsing', 'OpenSecurity Error') + diff -r 74e42f671ec4 -r c007fc48f812 OpenSecurity/bin/ui/about_dialog.py --- a/OpenSecurity/bin/ui/about_dialog.py Wed Jun 25 20:39:42 2014 +0200 +++ b/OpenSecurity/bin/ui/about_dialog.py Wed Jun 25 20:40:12 2014 +0200 @@ -108,13 +108,13 @@
-Copyright 2013, 2014 The OpenSecurity Consortium
+Copyright 2013, 2014 The OpenSecurity Consortium, http://www.opensecurity.at

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

-http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff -r 74e42f671ec4 -r c007fc48f812 OpenSecurity/bin/ui/configure_dialog.py --- a/OpenSecurity/bin/ui/configure_dialog.py Wed Jun 25 20:39:42 2014 +0200 +++ b/OpenSecurity/bin/ui/configure_dialog.py Wed Jun 25 20:40:12 2014 +0200 @@ -59,6 +59,7 @@ import json import os +import subprocess import sys import urllib2 @@ -103,13 +104,14 @@ self._file_watched_name = '' self._file_watched_size = 0 self._file_watcher = QtCore.QTimer(self) - self._service_log_path = '' + self._service_log_file = '' self._service_log_size = 0 # connectors self.ui.btnAbout.clicked.connect(self.clicked_about) self.ui.btnClose.clicked.connect(self.accept) self.ui.btnDownload.clicked.connect(self.clicked_download) + self.ui.btnExplorer.clicked.connect(self.clicked_explorer) self.ui.btnImport.clicked.connect(self.clicked_import) self.ui.btnRefresh.clicked.connect(self.clicked_refresh) self._file_watcher.timeout.connect(self.update_progress) @@ -144,6 +146,13 @@ pass + def clicked_explorer(self): + + """Explorer button has been clicked.""" + if sys.platform == 'win32' or sys.platform == 'cygwin': + subprocess.Popen([os.path.join(os.environ['WINDIR'], 'explorer.exe'), self._service_log_path]) + + def clicked_import(self): """Import button has been clicked.""" @@ -181,7 +190,8 @@ self.ui.edtStatus.setEnabled(True) self.ui.edtVersion.setText(j['os_server']['version']) self.ui.edtVersion.setEnabled(True) - self._service_log_path = os.path.join(j['os_server']['current log folder'], 'OpenSecurity.log') + self._service_log_path = j['os_server']['current log folder'] + self._service_log_file = os.path.join(self._service_log_path, 'OpenSecurity.log') self._service_log_size = 0 # get initial template info @@ -216,10 +226,10 @@ # This is terrible. # first the service log - if self._service_log_path != '': - file_size = os.stat(self._service_log_path).st_size + if self._service_log_file != '': + file_size = os.stat(self._service_log_file).st_size if file_size > self._service_log_size: - f = open(self._service_log_path, 'r') + f = open(self._service_log_file, 'r') f.seek(self._service_log_size) self.ui.edtLog.appendPlainText(f.read()) self._service_log_size = file_size @@ -233,9 +243,8 @@ return f = open(self._file_watched_name, 'r') - f.seek(self._file_watched_size) - self.ui.edtProgress.appendPlainText(f.read()) - #self.ui.edtProgress.verticalScrollBar().setValue(self.ui.edtProgress.verticalScrollBar().maximum()) + self.ui.edtProgress.setPlainText(f.read()) + self.ui.edtProgress.verticalScrollBar().setValue(self.ui.edtProgress.verticalScrollBar().maximum()) self._file_watched_size = file_size