1.1 --- a/OpenSecurity.iss Wed Oct 29 15:18:22 2014 +0100
1.2 +++ b/OpenSecurity.iss Wed Oct 29 18:22:39 2014 +0100
1.3 @@ -35,7 +35,7 @@
1.4 AppContact=AIT Austrian Institute of Technology
1.5 AppPublisher=AIT Austrian Institute of Technology
1.6 AppPublisherURL=http://www.ait.ac.at/
1.7 -AppVersion=0.2.10
1.8 +AppVersion=0.2.11
1.9 ArchitecturesInstallIn64BitMode=x64
1.10 DefaultDirName={pf}\OpenSecurity
1.11 DefaultGroupName=OpenSecurity
1.12 @@ -46,7 +46,7 @@
1.13 ; DisableReadyPage=yes
1.14 ; DisableWelcomePage=yes
1.15 OutputDir="."
1.16 -OutputBaseFilename="OpenSecurity Setup V0.2.10"
1.17 +OutputBaseFilename="OpenSecurity Setup V0.2.11"
1.18 OutputManifestFile=OpenSecurity-Setup-Manifest.txt
1.19 SetupIconFile=OpenSecurity\bin\ui\gfx\OpenSecurity.ico
1.20 SolidCompression=yes
1.21 @@ -69,7 +69,7 @@
1.22 Name: "{app}\log"; Permissions: everyone-modify
1.23
1.24 [Registry]
1.25 -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
1.26 +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
1.27 Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "LogServerUrl"; ValueType: string; ValueData: "{code:URLLogServer}"; Flags: uninsdeletevalue
1.28 Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "Browser"; ValueType: string; ValueData: "{code:VMBrowser}"; Flags: uninsdeletevalue
1.29 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\services\USBSTOR"; ValueName: "Start"; ValueType: dword; ValueData: 4;
1.30 @@ -84,6 +84,7 @@
1.31 Filename: "{app}\cygwin64\bin\dash.exe"; Parameters: "/bin/rebaseall"; Description: "Rebasing background system"; WorkingDir: "{app}"; StatusMsg: "Rebasing background system..."; Flags: runascurrentuser
1.32 Filename: "{app}\install\fix_cygwin_paths.bat"; Description: "Fixing Cygwin paths"; WorkingDir: "{app}\install"; StatusMsg: "Fixing Cygwin Paths...";
1.33 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...";
1.34 +Filename: "{app}\bin\firewall-install.bat"; Description: "Setup firewall rules"; WorkingDir: "{app}"; StatusMsg: "Setup firewall rules...";
1.35 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
1.36 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" start"; Description: "Starting OpenSecurity Service"; WorkingDir: "{app}"; StatusMsg: "Starting OpenSecurity Service"; Flags: runascurrentuser
1.37 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Description: "Launching OpenSecurity Tray Icon"; Flags: nowait
1.38 @@ -92,6 +93,7 @@
1.39 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\terminate_client_tray.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Client Tray Service"; Flags: runascurrentuser
1.40 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Service"; Flags: runascurrentuser
1.41 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" remove"; WorkingDir: "{app}"; StatusMsg: "Removing the OpenSecurity Service"; Flags: runascurrentuser
1.42 +Filename: "{app}\bin\firewall-uninstall.bat"; WorkingDir: "{app}"; StatusMsg: "Uninstall firewall rules...";
1.43
1.44 [UninstallDelete]
1.45 Type: filesandordirs; Name: "{app}"
2.1 --- a/OpenSecurity/Lizenz.txt Wed Oct 29 15:18:22 2014 +0100
2.2 +++ b/OpenSecurity/Lizenz.txt Wed Oct 29 18:22:39 2014 +0100
2.3 @@ -28,3 +28,15 @@
2.4 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
2.5 See the License for the specific language governing permissions and
2.6 limitations under the License.
2.7 +
2.8 +The license covers the work of X-Net and AIT solely within the OpenSecurity
2.9 +project, http://www.opensecurity.at. It does not extend to affiliated
2.10 +work, software and technologies.
2.11 +
2.12 +OpenSecurity uses Software and Programs including (but not limited to):
2.13 +
2.14 + * VirtualBox: GPL version 2 - http://www.virtualbox.org
2.15 + * VirtualBox Oracle VM VirtualBox Extension Pack: Virtual Personal Use and Evaluation License (PUEL) - http://www.virtualbox.org
2.16 + * Cygwin: GPL and GPL derivats - http://cygwin.com/licensing.html
2.17 + * Python: PSF License Agreement for Ptyhon 3.4.2 - http://docs.python.org/3/license.html
2.18 +
3.1 --- a/OpenSecurity/bin/__init__.py Wed Oct 29 15:18:22 2014 +0100
3.2 +++ b/OpenSecurity/bin/__init__.py Wed Oct 29 18:22:39 2014 +0100
3.3 @@ -44,5 +44,5 @@
3.4 __copyright__ = 'Copyright 2014 The OpenSecurity Consortium'
3.5 __license__ = 'GPL v3'
3.6 __title__ = 'opensecurity'
3.7 -__version__ = '0.2.10'
3.8 +__version__ = '0.2.11'
3.9
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/OpenSecurity/bin/firewall-install.bat Wed Oct 29 18:22:39 2014 +0100
4.3 @@ -0,0 +1,4 @@
4.4 +@echo off
4.5 +echo 'adding firewall rules for OpenSecurity...'
4.6 +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
4.7 +
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/OpenSecurity/bin/firewall-uninstall.bat Wed Oct 29 18:22:39 2014 +0100
5.3 @@ -0,0 +1,4 @@
5.4 +@echo off
5.5 +echo 'removing firewall rules for OpenSecurity...'
5.6 +netsh advfirewall firewall delete rule name="Osec Communication Rule"
5.7 +