# HG changeset patch # User Oliver Maurhart # Date 1414603359 -3600 # Node ID 6f73753677aa04a42d8109e1e9034e3b2a5e7079 # Parent d7ef04254e9c54a6863b6ee2e20636657b8e38fa a new approach for firewall tweaks on install diff -r d7ef04254e9c -r 6f73753677aa OpenSecurity.iss --- a/OpenSecurity.iss Wed Oct 29 15:18:22 2014 +0100 +++ b/OpenSecurity.iss Wed Oct 29 18:22:39 2014 +0100 @@ -35,7 +35,7 @@ AppContact=AIT Austrian Institute of Technology AppPublisher=AIT Austrian Institute of Technology AppPublisherURL=http://www.ait.ac.at/ -AppVersion=0.2.10 +AppVersion=0.2.11 ArchitecturesInstallIn64BitMode=x64 DefaultDirName={pf}\OpenSecurity DefaultGroupName=OpenSecurity @@ -46,7 +46,7 @@ ; DisableReadyPage=yes ; DisableWelcomePage=yes OutputDir="." -OutputBaseFilename="OpenSecurity Setup V0.2.10" +OutputBaseFilename="OpenSecurity Setup V0.2.11" OutputManifestFile=OpenSecurity-Setup-Manifest.txt SetupIconFile=OpenSecurity\bin\ui\gfx\OpenSecurity.ico SolidCompression=yes @@ -69,7 +69,7 @@ Name: "{app}\log"; Permissions: everyone-modify [Registry] -Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueName: "OpenSecurity Tray Icon"; ValueType: string; ValueData: "{app}\python27\pythonw.exe ""{app}\bin\opensecurity_tray.pyw"""; Flags: uninsdeletevalue +Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueName: "OpenSecurity Tray Icon"; ValueType: string; ValueData: "{app}\python27\pythonw.exe ""{app}\bin\opensecurity_tray.pyw"""; Flags: uninsdeletevalue Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "LogServerUrl"; ValueType: string; ValueData: "{code:URLLogServer}"; Flags: uninsdeletevalue Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "Browser"; ValueType: string; ValueData: "{code:VMBrowser}"; Flags: uninsdeletevalue Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\services\USBSTOR"; ValueName: "Start"; ValueType: dword; ValueData: 4; @@ -84,6 +84,7 @@ Filename: "{app}\cygwin64\bin\dash.exe"; Parameters: "/bin/rebaseall"; Description: "Rebasing background system"; WorkingDir: "{app}"; StatusMsg: "Rebasing background system..."; Flags: runascurrentuser Filename: "{app}\install\fix_cygwin_paths.bat"; Description: "Fixing Cygwin paths"; WorkingDir: "{app}\install"; StatusMsg: "Fixing Cygwin Paths..."; Filename: "{app}\cygwin64\bin\bash.exe"; Parameters: "-l -i -c echo -n"; Description: "Enforcing login environment for shells"; WorkingDir: "{app}"; StatusMsg: "Enforcing login environment for shells..."; +Filename: "{app}\bin\firewall-install.bat"; Description: "Setup firewall rules"; WorkingDir: "{app}"; StatusMsg: "Setup firewall rules..."; Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" --startup auto install"; Description: "Installing the OpenSecurity Service"; WorkingDir: "{app}"; StatusMsg: "Installing the OpenSecurity Service"; Flags: runascurrentuser Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" start"; Description: "Starting OpenSecurity Service"; WorkingDir: "{app}"; StatusMsg: "Starting OpenSecurity Service"; Flags: runascurrentuser Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Description: "Launching OpenSecurity Tray Icon"; Flags: nowait @@ -92,6 +93,7 @@ Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\terminate_client_tray.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Client Tray Service"; Flags: runascurrentuser Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Service"; Flags: runascurrentuser Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" remove"; WorkingDir: "{app}"; StatusMsg: "Removing the OpenSecurity Service"; Flags: runascurrentuser +Filename: "{app}\bin\firewall-uninstall.bat"; WorkingDir: "{app}"; StatusMsg: "Uninstall firewall rules..."; [UninstallDelete] Type: filesandordirs; Name: "{app}" diff -r d7ef04254e9c -r 6f73753677aa OpenSecurity/Lizenz.txt --- a/OpenSecurity/Lizenz.txt Wed Oct 29 15:18:22 2014 +0100 +++ b/OpenSecurity/Lizenz.txt Wed Oct 29 18:22:39 2014 +0100 @@ -28,3 +28,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +The license covers the work of X-Net and AIT solely within the OpenSecurity +project, http://www.opensecurity.at. It does not extend to affiliated +work, software and technologies. + +OpenSecurity uses Software and Programs including (but not limited to): + + * VirtualBox: GPL version 2 - http://www.virtualbox.org + * VirtualBox Oracle VM VirtualBox Extension Pack: Virtual Personal Use and Evaluation License (PUEL) - http://www.virtualbox.org + * Cygwin: GPL and GPL derivats - http://cygwin.com/licensing.html + * Python: PSF License Agreement for Ptyhon 3.4.2 - http://docs.python.org/3/license.html + diff -r d7ef04254e9c -r 6f73753677aa OpenSecurity/bin/__init__.py --- a/OpenSecurity/bin/__init__.py Wed Oct 29 15:18:22 2014 +0100 +++ b/OpenSecurity/bin/__init__.py Wed Oct 29 18:22:39 2014 +0100 @@ -44,5 +44,5 @@ __copyright__ = 'Copyright 2014 The OpenSecurity Consortium' __license__ = 'GPL v3' __title__ = 'opensecurity' -__version__ = '0.2.10' +__version__ = '0.2.11' diff -r d7ef04254e9c -r 6f73753677aa OpenSecurity/bin/firewall-install.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OpenSecurity/bin/firewall-install.bat Wed Oct 29 18:22:39 2014 +0100 @@ -0,0 +1,4 @@ +@echo off +echo 'adding firewall rules for OpenSecurity...' +netsh advfirewall firewall add rule name="Osec Communication Rule" dir=in action=allow profile=any localip=192.168.56.1 remoteip=192.168.56.0/24 localport=8090 remoteport=any protocol=tcp + diff -r d7ef04254e9c -r 6f73753677aa OpenSecurity/bin/firewall-uninstall.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OpenSecurity/bin/firewall-uninstall.bat Wed Oct 29 18:22:39 2014 +0100 @@ -0,0 +1,4 @@ +@echo off +echo 'removing firewall rules for OpenSecurity...' +netsh advfirewall firewall delete rule name="Osec Communication Rule" +