1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/OpenSecurity-IKT.iss Tue Jan 13 18:47:53 2015 +0100
1.3 @@ -0,0 +1,135 @@
1.4 +; -- OpenSecurity.iss --
1.5 +; OpenSecurity setup file for use with
1.6 +; Inno Setup Compiler (http://www.jrsoftware.org/isinfo.php)
1.7 +
1.8 +; Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
1.9 +;
1.10 +;
1.11 +; X-Net Services GmbH
1.12 +; Elisabethstrasse 1
1.13 +; 4020 Linz
1.14 +; AUSTRIA
1.15 +; https://www.x-net.at
1.16 +;
1.17 +; AIT Austrian Institute of Technology
1.18 +; Donau City Strasse 1
1.19 +; 1220 Wien
1.20 +; AUSTRIA
1.21 +; http://www.ait.ac.at
1.22 +;
1.23 +;
1.24 +; Licensed under the Apache License, Version 2.0 (the "License");
1.25 +; you may not use this file except in compliance with the License.
1.26 +; You may obtain a copy of the License at
1.27 +;
1.28 +; http://www.apache.org/licenses/LICENSE-2.0
1.29 +;
1.30 +; Unless required by applicable law or agreed to in writing, software
1.31 +; distributed under the License is distributed on an "AS IS" BASIS,
1.32 +; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1.33 +; See the License for the specific language governing permissions and
1.34 +; limitations under the License.
1.35 +
1.36 +[Setup]
1.37 +AppName=OpenSecurity
1.38 +AppContact=AIT Austrian Institute of Technology
1.39 +AppPublisher=AIT Austrian Institute of Technology
1.40 +AppPublisherURL=http://www.ait.ac.at/
1.41 +AppVersion=1.0
1.42 +ArchitecturesInstallIn64BitMode=x64
1.43 +DefaultDirName={pf}\OpenSecurity
1.44 +DefaultGroupName=OpenSecurity
1.45 +; DisableDirPage=yes
1.46 +; DisableFinishedPage=yes
1.47 +; DisableProgramGroupPage=yes
1.48 +; DisableReadyMemo=yes
1.49 +; DisableReadyPage=yes
1.50 +; DisableWelcomePage=yes
1.51 +LicenseFile=OpenSecurity\Lizenz.txt
1.52 +OutputDir="."
1.53 +OutputBaseFilename="OpenSecurity Setup IKT V1.0"
1.54 +OutputManifestFile=OpenSecurity-Setup-Manifest.txt
1.55 +SetupIconFile=OpenSecurity\bin\ui\gfx\OpenSecurity.ico
1.56 +SolidCompression=yes
1.57 +UninstallDisplayIcon={app}\bin\ui\gfx\OpenSecurity.ico
1.58 +
1.59 +[Files]
1.60 +Source: "OpenSecurity\Lizenz.txt"; DestDir: "{app}";
1.61 +Source: "OpenSecurity\bin\*"; Excludes: "*.pyc,*.swp"; DestDir: "{app}\bin"; Flags: recursesubdirs createallsubdirs;
1.62 +Source: "OpenSecurity\cygwin64\*"; DestDir: "{app}\cygwin64"; Flags: recursesubdirs createallsubdirs;
1.63 +Source: "OpenSecurity\install\*"; DestDir: "{app}\install"; Flags: recursesubdirs createallsubdirs;
1.64 +Source: "OpenSecurity\python27\*"; DestDir: "{app}\python27"; Flags: recursesubdirs createallsubdirs;
1.65 +Source: "OpenSecurity\python27\python27.dll"; DestDir: "{sys}"; Flags: sharedfile;
1.66 +Source: "OpenSecurity\python27\Lib\site-packages\pywin32_system32\pywintypes27.dll"; DestDir: "{sys}"; Flags: sharedfile;
1.67 +Source: "OpenSecurity\systemprofile-IKT\.VirtualBox\*"; DestDir: "{sys}\config\systemprofile\.VirtualBox"; Flags: recursesubdirs createallsubdirs;
1.68 +Source: "OpenSecurity\systemprofile-IKT\VirtualBox VMs\*"; DestDir: "{sys}\config\systemprofile\VirtualBox VMs"; Flags: recursesubdirs createallsubdirs;
1.69 +Source: "OpenSecurity\Apache License, Version 2.0.txt"; DestDir: "{app}";
1.70 +
1.71 +[Dirs]
1.72 +Name: "{app}\cygwin64\var\log\xwin"; Permissions: everyone-modify
1.73 +Name: "{app}\log"; Permissions: everyone-modify
1.74 +
1.75 +[Registry]
1.76 +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.77 +Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "LogServerUrl"; ValueType: string; ValueData: "{code:URLLogServer}"; Flags: uninsdeletevalue
1.78 +Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "Browser"; ValueType: string; ValueData: "{code:VMBrowser}"; Flags: uninsdeletevalue
1.79 +Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "ImageUrl"; ValueType: string; ValueData: "http://service.x-net.at/opensecurity/OsecVM_latest.ova"; Flags: uninsdeletevalue
1.80 +Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\services\USBSTOR"; ValueName: "Start"; ValueType: dword; ValueData: 4;
1.81 +
1.82 +[Icons]
1.83 +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"
1.84 +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"
1.85 +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"
1.86 +Name: "{group}\Uninstall OpenSecurity"; Filename: "{uninstallexe}"
1.87 +
1.88 +[Run]
1.89 +Filename: "{app}\cygwin64\bin\dash.exe"; Parameters: "/bin/rebaseall"; Description: "Rebasing background system"; WorkingDir: "{app}"; StatusMsg: "Rebasing background system..."; Flags: runascurrentuser
1.90 +Filename: "{app}\install\fix_cygwin_paths.bat"; Description: "Fixing Cygwin paths"; WorkingDir: "{app}\install"; StatusMsg: "Fixing Cygwin Paths...";
1.91 +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.92 +Filename: "{app}\bin\firewall-install.bat"; Description: "Setup firewall rules"; WorkingDir: "{app}"; StatusMsg: "Setup firewall rules...";
1.93 +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.94 +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.95 +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Description: "Launching OpenSecurity Tray Icon"; Flags: nowait
1.96 +
1.97 +[UninstallRun]
1.98 +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.99 +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Service"; Flags: runascurrentuser
1.100 +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" remove"; WorkingDir: "{app}"; StatusMsg: "Removing the OpenSecurity Service"; Flags: runascurrentuser
1.101 +Filename: "{app}\bin\firewall-uninstall.bat"; WorkingDir: "{app}"; StatusMsg: "Uninstall firewall rules...";
1.102 +
1.103 +[UninstallDelete]
1.104 +Type: filesandordirs; Name: "{app}"
1.105 +
1.106 +
1.107 +[Code]
1.108 +var
1.109 + UserInputPage: TInputQueryWizardPage;
1.110 +
1.111 +procedure InitializeWizard;
1.112 +begin
1.113 +
1.114 + // Create the page
1.115 + UserInputPage := CreateInputQueryPage(wpWelcome,
1.116 + 'Installation Details',
1.117 + 'Essential settings for the current OpenSecurity Installation',
1.118 + 'Please specify concrete details for the OpenSecurity Installation. In doubt, leave unchanged.');
1.119 +
1.120 + // Add items (False means it's not a password edit)
1.121 + UserInputPage.Add('VM Browser:', False);
1.122 + UserInputPage.Add('URL of Logserver:', False);
1.123 +
1.124 + // Set initial values (optional)
1.125 + UserInputPage.Values[0] := '/usr/bin/chromium';
1.126 + UserInputPage.Values[1] := 'http://10.215.5.166/opensecurity/log';
1.127 +
1.128 +end;
1.129 +
1.130 +function VMBrowser(Param: String): String;
1.131 +begin
1.132 + Result := UserInputPage.Values[0]
1.133 +end;
1.134 +
1.135 +function URLLogServer(Param: String): String;
1.136 +begin
1.137 + Result := UserInputPage.Values[1]
1.138 +end;
2.1 --- a/OpenSecurity.iss Tue Jan 13 18:26:41 2015 +0100
2.2 +++ b/OpenSecurity.iss Tue Jan 13 18:47:53 2015 +0100
2.3 @@ -35,7 +35,7 @@
2.4 AppContact=AIT Austrian Institute of Technology
2.5 AppPublisher=AIT Austrian Institute of Technology
2.6 AppPublisherURL=http://www.ait.ac.at/
2.7 -AppVersion=0.2.12
2.8 +AppVersion=1.0
2.9 ArchitecturesInstallIn64BitMode=x64
2.10 DefaultDirName={pf}\OpenSecurity
2.11 DefaultGroupName=OpenSecurity
2.12 @@ -47,7 +47,7 @@
2.13 ; DisableWelcomePage=yes
2.14 LicenseFile=OpenSecurity\Lizenz.txt
2.15 OutputDir="."
2.16 -OutputBaseFilename="OpenSecurity Setup V0.2.12"
2.17 +OutputBaseFilename="OpenSecurity Setup V1.0"
2.18 OutputManifestFile=OpenSecurity-Setup-Manifest.txt
2.19 SetupIconFile=OpenSecurity\bin\ui\gfx\OpenSecurity.ico
2.20 SolidCompression=yes
2.21 @@ -73,6 +73,7 @@
2.22 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
2.23 Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "LogServerUrl"; ValueType: string; ValueData: "{code:URLLogServer}"; Flags: uninsdeletevalue
2.24 Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "Browser"; ValueType: string; ValueData: "{code:VMBrowser}"; Flags: uninsdeletevalue
2.25 +Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "ImageUrl"; ValueType: string; ValueData: "http://service.x-net.at/opensecurity/OsecVM_latest_clamav.ova"; Flags: uninsdeletevalue
2.26 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\services\USBSTOR"; ValueName: "Start"; ValueType: dword; ValueData: 4;
2.27
2.28 [Icons]
2.29 @@ -119,7 +120,7 @@
2.30
2.31 // Set initial values (optional)
2.32 UserInputPage.Values[0] := '/usr/bin/chromium';
2.33 - UserInputPage.Values[1] := 'http://10.215.5.166/opensecurity/log';
2.34 + UserInputPage.Values[1] := 'http://placeholder.mydomain.local:10000/logpath';
2.35
2.36 end;
2.37
3.1 --- a/OpenSecurity/bin/__init__.py Tue Jan 13 18:26:41 2015 +0100
3.2 +++ b/OpenSecurity/bin/__init__.py Tue Jan 13 18:47:53 2015 +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.12'
3.8 +__version__ = '1.0'
3.9
4.1 --- a/OpenSecurity/bin/download_initial_image.sh Tue Jan 13 18:26:41 2015 +0100
4.2 +++ b/OpenSecurity/bin/download_initial_image.sh Tue Jan 13 18:47:53 2015 +0100
4.3 @@ -67,7 +67,12 @@
4.4 fi
4.5
4.6 # start download
4.7 -URL="http://service.x-net.at/opensecurity/OsecVM_latest.ova"
4.8 +URL=$(cat /proc/registry64/HKEY_LOCAL_MACHINE/SOFTWARE/OpenSecurity/ImageUrl)
4.9 +if [ $? != "0" ]; then
4.10 + echo "no URL given at HKEY_LOCAL_MACHINE/SOFTWARE/OpenSecurity/ImageUrl"
4.11 + echo "don't know where to look"
4.12 + exit 1
4.13 +fi
4.14 wget --progress=dot:mega ${URL} -O "${TARGET_FOLDER}"/OsecVM.ova
4.15
4.16