1.1 --- a/OpenSecurity.iss Wed Oct 29 15:02:42 2014 +0100
1.2 +++ b/OpenSecurity.iss Wed Oct 29 15:18:22 2014 +0100
1.3 @@ -2,21 +2,20 @@
1.4 ; OpenSecurity setup file for use with
1.5 ; Inno Setup Compiler (http://www.jrsoftware.org/isinfo.php)
1.6
1.7 -; OpenSecurity
1.8 -; ============
1.9 -;
1.10 ; Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
1.11 ;
1.12 ;
1.13 -; X-Net Technologies GmbH
1.14 +; X-Net Services GmbH
1.15 ; Elisabethstrasse 1
1.16 ; 4020 Linz
1.17 ; AUSTRIA
1.18 +; https://www.x-net.at
1.19 ;
1.20 ; AIT Austrian Institute of Technology
1.21 ; Donau City Strasse 1
1.22 ; 1220 Wien
1.23 ; AUSTRIA
1.24 +; http://www.ait.ac.at
1.25 ;
1.26 ;
1.27 ; Licensed under the Apache License, Version 2.0 (the "License");
1.28 @@ -31,7 +30,6 @@
1.29 ; See the License for the specific language governing permissions and
1.30 ; limitations under the License.
1.31
1.32 -
1.33 [Setup]
1.34 AppName=OpenSecurity
1.35 AppContact=AIT Austrian Institute of Technology
1.36 @@ -55,6 +53,7 @@
1.37 UninstallDisplayIcon={app}\bin\ui\gfx\OpenSecurity.ico
1.38
1.39 [Files]
1.40 +Source: "OpenSecurity\Lizenz.txt"; DestDir: "{app}";
1.41 Source: "OpenSecurity\bin\*"; Excludes: "*.pyc,*.swp"; DestDir: "{app}\bin"; Flags: recursesubdirs createallsubdirs;
1.42 Source: "OpenSecurity\cygwin64\*"; DestDir: "{app}\cygwin64"; Flags: recursesubdirs createallsubdirs;
1.43 Source: "OpenSecurity\install\*"; DestDir: "{app}\install"; Flags: recursesubdirs createallsubdirs;
2.1 --- a/OpenSecurity/bin/__init__.py Wed Oct 29 15:02:42 2014 +0100
2.2 +++ b/OpenSecurity/bin/__init__.py Wed Oct 29 15:18:22 2014 +0100
2.3 @@ -10,7 +10,7 @@
2.4 # Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
2.5 #
2.6 #
2.7 -# X-Net Technologies GmbH
2.8 +# X-Net Services GmbH
2.9 # Elisabethstrasse 1
2.10 # 4020 Linz
2.11 # AUSTRIA
3.1 --- a/OpenSecurity/bin/create-cert-and-iso.sh Wed Oct 29 15:02:42 2014 +0100
3.2 +++ b/OpenSecurity/bin/create-cert-and-iso.sh Wed Oct 29 15:18:22 2014 +0100
3.3 @@ -1,7 +1,39 @@
3.4 #!/bin/sh
3.5
3.6 -# create a ssh-key pair in the current folder
3.7 +# ------------------------------------------------------------
3.8 +# create-and-iso
3.9 +#
3.10 +# shell script to create SSH key pairs and place them inisde an ISO image
3.11 +#
3.12 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
3.13 +#
3.14 +#
3.15 +# X-Net Services GmbH
3.16 +# Elisabethstrasse 1
3.17 +# 4020 Linz
3.18 +# AUSTRIA
3.19 +# https://www.x-net.at
3.20 +#
3.21 +# AIT Austrian Institute of Technology
3.22 +# Donau City Strasse 1
3.23 +# 1220 Wien
3.24 +# AUSTRIA
3.25 +# http://www.ait.ac.at
3.26 +#
3.27 +#
3.28 +# Licensed under the Apache License, Version 2.0 (the "License");
3.29 +# you may not use this file except in compliance with the License.
3.30 +# You may obtain a copy of the License at
3.31 +#
3.32 +# http://www.apache.org/licenses/LICENSE-2.0
3.33 +#
3.34 +# Unless required by applicable law or agreed to in writing, software
3.35 +# distributed under the License is distributed on an "AS IS" BASIS,
3.36 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3.37 +# See the License for the specific language governing permissions and
3.38 +# limitations under the License.
3.39 # and create a ISO image with it
3.40 +# ------------------------------------------------------------
3.41
3.42 VM_NAME=$(basename "$(pwd)")
3.43 echo ${VM_NAME}
4.1 --- a/OpenSecurity/bin/cygwin.py Wed Oct 29 15:02:42 2014 +0100
4.2 +++ b/OpenSecurity/bin/cygwin.py Wed Oct 29 15:18:22 2014 +0100
4.3 @@ -9,24 +9,33 @@
4.4 # Autor: Mihai Bartha, <mihai.bartha@ait.ac.at>
4.5 # Oliver Maurhart, <oliver.maurhart@ait.ac.at>
4.6 #
4.7 -# Copyright (C) 2013 AIT Austrian Institute of Technology
4.8 -# AIT Austrian Institute of Technology GmbH
4.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
4.10 -# http://www.ait.ac.at
4.11 -#
4.12 -# This program is free software; you can redistribute it and/or
4.13 -# modify it under the terms of the GNU General Public License
4.14 -# as published by the Free Software Foundation version 2.
4.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
4.16 #
4.17 -# This program is distributed in the hope that it will be useful,
4.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
4.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4.20 -# GNU General Public License for more details.
4.21 #
4.22 -# You should have received a copy of the GNU General Public License
4.23 -# along with this program; if not, write to the Free Software
4.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
4.25 -# Boston, MA 02110-1301, USA.
4.26 +# X-Net Services GmbH
4.27 +# Elisabethstrasse 1
4.28 +# 4020 Linz
4.29 +# AUSTRIA
4.30 +# https://www.x-net.at
4.31 +#
4.32 +# AIT Austrian Institute of Technology
4.33 +# Donau City Strasse 1
4.34 +# 1220 Wien
4.35 +# AUSTRIA
4.36 +# http://www.ait.ac.at
4.37 +#
4.38 +#
4.39 +# Licensed under the Apache License, Version 2.0 (the "License");
4.40 +# you may not use this file except in compliance with the License.
4.41 +# You may obtain a copy of the License at
4.42 +#
4.43 +# http://www.apache.org/licenses/LICENSE-2.0
4.44 +#
4.45 +# Unless required by applicable law or agreed to in writing, software
4.46 +# distributed under the License is distributed on an "AS IS" BASIS,
4.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
4.48 +# See the License for the specific language governing permissions and
4.49 +# limitations under the License.
4.50 # ------------------------------------------------------------
4.51
4.52
5.1 --- a/OpenSecurity/bin/download-image.pyw Wed Oct 29 15:02:42 2014 +0100
5.2 +++ b/OpenSecurity/bin/download-image.pyw Wed Oct 29 15:18:22 2014 +0100
5.3 @@ -6,26 +6,33 @@
5.4 #
5.5 # download the initial OsecVM.ova image
5.6 #
5.7 -# Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
5.8 -#
5.9 -# Copyright (C) 2014 AIT Austrian Institute of Technology
5.10 -# AIT Austrian Institute of Technology GmbH
5.11 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
5.12 -# http://www.ait.ac.at
5.13 -#
5.14 -# This program is free software; you can redistribute it and/or
5.15 -# modify it under the terms of the GNU General Public License
5.16 -# as published by the Free Software Foundation version 2.
5.17 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
5.18 #
5.19 -# This program is distributed in the hope that it will be useful,
5.20 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
5.21 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5.22 -# GNU General Public License for more details.
5.23 #
5.24 -# You should have received a copy of the GNU General Public License
5.25 -# along with this program; if not, write to the Free Software
5.26 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
5.27 -# Boston, MA 02110-1301, USA.
5.28 +# X-Net Services GmbH
5.29 +# Elisabethstrasse 1
5.30 +# 4020 Linz
5.31 +# AUSTRIA
5.32 +# https://www.x-net.at
5.33 +#
5.34 +# AIT Austrian Institute of Technology
5.35 +# Donau City Strasse 1
5.36 +# 1220 Wien
5.37 +# AUSTRIA
5.38 +# http://www.ait.ac.at
5.39 +#
5.40 +#
5.41 +# Licensed under the Apache License, Version 2.0 (the "License");
5.42 +# you may not use this file except in compliance with the License.
5.43 +# You may obtain a copy of the License at
5.44 +#
5.45 +# http://www.apache.org/licenses/LICENSE-2.0
5.46 +#
5.47 +# Unless required by applicable law or agreed to in writing, software
5.48 +# distributed under the License is distributed on an "AS IS" BASIS,
5.49 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
5.50 +# See the License for the specific language governing permissions and
5.51 +# limitations under the License.
5.52 # ------------------------------------------------------------
5.53
5.54
6.1 --- a/OpenSecurity/bin/download_initial_image.sh Wed Oct 29 15:02:42 2014 +0100
6.2 +++ b/OpenSecurity/bin/download_initial_image.sh Wed Oct 29 15:18:22 2014 +0100
6.3 @@ -1,13 +1,40 @@
6.4 #!/bin/bash
6.5
6.6 # ------------------------------------------------------------
6.7 +# download_initial_image.sh
6.8 +#
6.9 # download initial VM for
6.10 #
6.11 -# OpenSecurity V0.2.10
6.12 -#
6.13 -# (C)opyright 2014, AIT Austrian Instiitute of Technology
6.14 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
6.15 +#
6.16 +#
6.17 +# X-Net Services GmbH
6.18 +# Elisabethstrasse 1
6.19 +# 4020 Linz
6.20 +# AUSTRIA
6.21 +# https://www.x-net.at
6.22 +#
6.23 +# AIT Austrian Institute of Technology
6.24 +# Donau City Strasse 1
6.25 +# 1220 Wien
6.26 +# AUSTRIA
6.27 +# http://www.ait.ac.at
6.28 +#
6.29 +#
6.30 +# Licensed under the Apache License, Version 2.0 (the "License");
6.31 +# you may not use this file except in compliance with the License.
6.32 +# You may obtain a copy of the License at
6.33 +#
6.34 +# http://www.apache.org/licenses/LICENSE-2.0
6.35 +#
6.36 +# Unless required by applicable law or agreed to in writing, software
6.37 +# distributed under the License is distributed on an "AS IS" BASIS,
6.38 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
6.39 +# See the License for the specific language governing permissions and
6.40 +# limitations under the License.
6.41 # ------------------------------------------------------------
6.42
6.43 +
6.44 # ------------------------------------------------------------
6.45 # code
6.46
7.1 --- a/OpenSecurity/bin/environment.py Wed Oct 29 15:02:42 2014 +0100
7.2 +++ b/OpenSecurity/bin/environment.py Wed Oct 29 15:18:22 2014 +0100
7.3 @@ -8,24 +8,33 @@
7.4 #
7.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
7.6 #
7.7 -# Copyright (C) 2013 AIT Austrian Institute of Technology
7.8 -# AIT Austrian Institute of Technology GmbH
7.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
7.10 -# http://www.ait.ac.at
7.11 -#
7.12 -# This program is free software; you can redistribute it and/or
7.13 -# modify it under the terms of the GNU General Public License
7.14 -# as published by the Free Software Foundation version 2.
7.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
7.16 #
7.17 -# This program is distributed in the hope that it will be useful,
7.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
7.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7.20 -# GNU General Public License for more details.
7.21 #
7.22 -# You should have received a copy of the GNU General Public License
7.23 -# along with this program; if not, write to the Free Software
7.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
7.25 -# Boston, MA 02110-1301, USA.
7.26 +# X-Net Services GmbH
7.27 +# Elisabethstrasse 1
7.28 +# 4020 Linz
7.29 +# AUSTRIA
7.30 +# https://www.x-net.at
7.31 +#
7.32 +# AIT Austrian Institute of Technology
7.33 +# Donau City Strasse 1
7.34 +# 1220 Wien
7.35 +# AUSTRIA
7.36 +# http://www.ait.ac.at
7.37 +#
7.38 +#
7.39 +# Licensed under the Apache License, Version 2.0 (the "License");
7.40 +# you may not use this file except in compliance with the License.
7.41 +# You may obtain a copy of the License at
7.42 +#
7.43 +# http://www.apache.org/licenses/LICENSE-2.0
7.44 +#
7.45 +# Unless required by applicable law or agreed to in writing, software
7.46 +# distributed under the License is distributed on an "AS IS" BASIS,
7.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
7.48 +# See the License for the specific language governing permissions and
7.49 +# limitations under the License.
7.50 # ------------------------------------------------------------
7.51
7.52
8.1 --- a/OpenSecurity/bin/initial_vm.sh Wed Oct 29 15:02:42 2014 +0100
8.2 +++ b/OpenSecurity/bin/initial_vm.sh Wed Oct 29 15:18:22 2014 +0100
8.3 @@ -3,8 +3,6 @@
8.4 # ------------------------------------------------------------
8.5 # install the initial VM for
8.6 #
8.7 -# OpenSecurity V0.2.10
8.8 -#
8.9 # This has been originally a Windows only BAT file.
8.10 #
8.11 # ... but coding this makes your head hurt and
8.12 @@ -12,7 +10,33 @@
8.13 # software to the world relying on CMD.exe is an act
8.14 # against humanity and should be punished by jail.
8.15 #
8.16 -# (C)opyright 2014, AIT Austrian Instiitute of Technology
8.17 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
8.18 +#
8.19 +#
8.20 +# X-Net Services GmbH
8.21 +# Elisabethstrasse 1
8.22 +# 4020 Linz
8.23 +# AUSTRIA
8.24 +# https://www.x-net.at
8.25 +#
8.26 +# AIT Austrian Institute of Technology
8.27 +# Donau City Strasse 1
8.28 +# 1220 Wien
8.29 +# AUSTRIA
8.30 +# http://www.ait.ac.at
8.31 +#
8.32 +#
8.33 +# Licensed under the Apache License, Version 2.0 (the "License");
8.34 +# you may not use this file except in compliance with the License.
8.35 +# You may obtain a copy of the License at
8.36 +#
8.37 +# http://www.apache.org/licenses/LICENSE-2.0
8.38 +#
8.39 +# Unless required by applicable law or agreed to in writing, software
8.40 +# distributed under the License is distributed on an "AS IS" BASIS,
8.41 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
8.42 +# See the License for the specific language governing permissions and
8.43 +# limitations under the License.
8.44 # ------------------------------------------------------------
8.45
8.46
9.1 --- a/OpenSecurity/bin/opensecurity_client_restful_server.py Wed Oct 29 15:02:42 2014 +0100
9.2 +++ b/OpenSecurity/bin/opensecurity_client_restful_server.py Wed Oct 29 15:18:22 2014 +0100
9.3 @@ -8,24 +8,33 @@
9.4 #
9.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
9.6 #
9.7 -# Copyright (C) 2013 AIT Austrian Institute of Technology
9.8 -# AIT Austrian Institute of Technology GmbH
9.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
9.10 -# http://www.ait.ac.at
9.11 -#
9.12 -# This program is free software; you can redistribute it and/or
9.13 -# modify it under the terms of the GNU General Public License
9.14 -# as published by the Free Software Foundation version 2.
9.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
9.16 #
9.17 -# This program is distributed in the hope that it will be useful,
9.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
9.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9.20 -# GNU General Public License for more details.
9.21 #
9.22 -# You should have received a copy of the GNU General Public License
9.23 -# along with this program; if not, write to the Free Software
9.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
9.25 -# Boston, MA 02110-1301, USA.
9.26 +# X-Net Services GmbH
9.27 +# Elisabethstrasse 1
9.28 +# 4020 Linz
9.29 +# AUSTRIA
9.30 +# https://www.x-net.at
9.31 +#
9.32 +# AIT Austrian Institute of Technology
9.33 +# Donau City Strasse 1
9.34 +# 1220 Wien
9.35 +# AUSTRIA
9.36 +# http://www.ait.ac.at
9.37 +#
9.38 +#
9.39 +# Licensed under the Apache License, Version 2.0 (the "License");
9.40 +# you may not use this file except in compliance with the License.
9.41 +# You may obtain a copy of the License at
9.42 +#
9.43 +# http://www.apache.org/licenses/LICENSE-2.0
9.44 +#
9.45 +# Unless required by applicable law or agreed to in writing, software
9.46 +# distributed under the License is distributed on an "AS IS" BASIS,
9.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9.48 +# See the License for the specific language governing permissions and
9.49 +# limitations under the License.
9.50 # ------------------------------------------------------------
9.51
9.52
10.1 --- a/OpenSecurity/bin/opensecurity_dialog.pyw Wed Oct 29 15:02:42 2014 +0100
10.2 +++ b/OpenSecurity/bin/opensecurity_dialog.pyw Wed Oct 29 15:18:22 2014 +0100
10.3 @@ -8,24 +8,33 @@
10.4 #
10.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
10.6 #
10.7 -# Copyright (C) 2013, 2014 AIT Austrian Institute of Technology
10.8 -# AIT Austrian Institute of Technology GmbH
10.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
10.10 -# http://www.ait.ac.at
10.11 -#
10.12 -# This program is free software; you can redistribute it and/or
10.13 -# modify it under the terms of the GNU General Public License
10.14 -# as published by the Free Software Foundation version 2.
10.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
10.16 #
10.17 -# This program is distributed in the hope that it will be useful,
10.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
10.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10.20 -# GNU General Public License for more details.
10.21 #
10.22 -# You should have received a copy of the GNU General Public License
10.23 -# along with this program; if not, write to the Free Software
10.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
10.25 -# Boston, MA 02110-1301, USA.
10.26 +# X-Net Services GmbH
10.27 +# Elisabethstrasse 1
10.28 +# 4020 Linz
10.29 +# AUSTRIA
10.30 +# https://www.x-net.at
10.31 +#
10.32 +# AIT Austrian Institute of Technology
10.33 +# Donau City Strasse 1
10.34 +# 1220 Wien
10.35 +# AUSTRIA
10.36 +# http://www.ait.ac.at
10.37 +#
10.38 +#
10.39 +# Licensed under the Apache License, Version 2.0 (the "License");
10.40 +# you may not use this file except in compliance with the License.
10.41 +# You may obtain a copy of the License at
10.42 +#
10.43 +# http://www.apache.org/licenses/LICENSE-2.0
10.44 +#
10.45 +# Unless required by applicable law or agreed to in writing, software
10.46 +# distributed under the License is distributed on an "AS IS" BASIS,
10.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10.48 +# See the License for the specific language governing permissions and
10.49 +# limitations under the License.
10.50 # ------------------------------------------------------------
10.51
10.52
11.1 --- a/OpenSecurity/bin/opensecurity_service.pyw Wed Oct 29 15:02:42 2014 +0100
11.2 +++ b/OpenSecurity/bin/opensecurity_service.pyw Wed Oct 29 15:18:22 2014 +0100
11.3 @@ -8,24 +8,33 @@
11.4 #
11.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
11.6 #
11.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
11.8 -# AIT Austrian Institute of Technology GmbH
11.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
11.10 -# http://www.ait.ac.at
11.11 -#
11.12 -# This program is free software; you can redistribute it and/or
11.13 -# modify it under the terms of the GNU General Public License
11.14 -# as published by the Free Software Foundation version 2.
11.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
11.16 #
11.17 -# This program is distributed in the hope that it will be useful,
11.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
11.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11.20 -# GNU General Public License for more details.
11.21 #
11.22 -# You should have received a copy of the GNU General Public License
11.23 -# along with this program; if not, write to the Free Software
11.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
11.25 -# Boston, MA 02110-1301, USA.
11.26 +# X-Net Services GmbH
11.27 +# Elisabethstrasse 1
11.28 +# 4020 Linz
11.29 +# AUSTRIA
11.30 +# https://www.x-net.at
11.31 +#
11.32 +# AIT Austrian Institute of Technology
11.33 +# Donau City Strasse 1
11.34 +# 1220 Wien
11.35 +# AUSTRIA
11.36 +# http://www.ait.ac.at
11.37 +#
11.38 +#
11.39 +# Licensed under the Apache License, Version 2.0 (the "License");
11.40 +# you may not use this file except in compliance with the License.
11.41 +# You may obtain a copy of the License at
11.42 +#
11.43 +# http://www.apache.org/licenses/LICENSE-2.0
11.44 +#
11.45 +# Unless required by applicable law or agreed to in writing, software
11.46 +# distributed under the License is distributed on an "AS IS" BASIS,
11.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11.48 +# See the License for the specific language governing permissions and
11.49 +# limitations under the License.
11.50 # ------------------------------------------------------------
11.51
11.52
12.1 --- a/OpenSecurity/bin/opensecurity_tray.pyw Wed Oct 29 15:02:42 2014 +0100
12.2 +++ b/OpenSecurity/bin/opensecurity_tray.pyw Wed Oct 29 15:18:22 2014 +0100
12.3 @@ -7,24 +7,33 @@
12.4 #
12.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
12.6 #
12.7 -# Copyright (C) 2013 AIT Austrian Institute of Technology
12.8 -# AIT Austrian Institute of Technology GmbH
12.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
12.10 -# http://www.ait.ac.at
12.11 -#
12.12 -# This program is free software; you can redistribute it and/or
12.13 -# modify it under the terms of the GNU General Public License
12.14 -# as published by the Free Software Foundation version 2.
12.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
12.16 #
12.17 -# This program is distributed in the hope that it will be useful,
12.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
12.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12.20 -# GNU General Public License for more details.
12.21 #
12.22 -# You should have received a copy of the GNU General Public License
12.23 -# along with this program; if not, write to the Free Software
12.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
12.25 -# Boston, MA 02110-1301, USA.
12.26 +# X-Net Services GmbH
12.27 +# Elisabethstrasse 1
12.28 +# 4020 Linz
12.29 +# AUSTRIA
12.30 +# https://www.x-net.at
12.31 +#
12.32 +# AIT Austrian Institute of Technology
12.33 +# Donau City Strasse 1
12.34 +# 1220 Wien
12.35 +# AUSTRIA
12.36 +# http://www.ait.ac.at
12.37 +#
12.38 +#
12.39 +# Licensed under the Apache License, Version 2.0 (the "License");
12.40 +# you may not use this file except in compliance with the License.
12.41 +# You may obtain a copy of the License at
12.42 +#
12.43 +# http://www.apache.org/licenses/LICENSE-2.0
12.44 +#
12.45 +# Unless required by applicable law or agreed to in writing, software
12.46 +# distributed under the License is distributed on an "AS IS" BASIS,
12.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12.48 +# See the License for the specific language governing permissions and
12.49 +# limitations under the License.
12.50 # ------------------------------------------------------------
12.51
12.52
13.1 --- a/OpenSecurity/bin/opensecurity_util.py Wed Oct 29 15:02:42 2014 +0100
13.2 +++ b/OpenSecurity/bin/opensecurity_util.py Wed Oct 29 15:18:22 2014 +0100
13.3 @@ -8,24 +8,33 @@
13.4 #
13.5 # Autor: Mihai Bartha, <mihai.bartha@ait.ac.at>
13.6 #
13.7 -# Copyright (C) 2013 AIT Austrian Institute of Technology
13.8 -# AIT Austrian Institute of Technology GmbH
13.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
13.10 -# http://www.ait.ac.at
13.11 -#
13.12 -# This program is free software; you can redistribute it and/or
13.13 -# modify it under the terms of the GNU General Public License
13.14 -# as published by the Free Software Foundation version 2.
13.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
13.16 #
13.17 -# This program is distributed in the hope that it will be useful,
13.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
13.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13.20 -# GNU General Public License for more details.
13.21 #
13.22 -# You should have received a copy of the GNU General Public License
13.23 -# along with this program; if not, write to the Free Software
13.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
13.25 -# Boston, MA 02110-1301, USA.
13.26 +# X-Net Services GmbH
13.27 +# Elisabethstrasse 1
13.28 +# 4020 Linz
13.29 +# AUSTRIA
13.30 +# https://www.x-net.at
13.31 +#
13.32 +# AIT Austrian Institute of Technology
13.33 +# Donau City Strasse 1
13.34 +# 1220 Wien
13.35 +# AUSTRIA
13.36 +# http://www.ait.ac.at
13.37 +#
13.38 +#
13.39 +# Licensed under the Apache License, Version 2.0 (the "License");
13.40 +# you may not use this file except in compliance with the License.
13.41 +# You may obtain a copy of the License at
13.42 +#
13.43 +# http://www.apache.org/licenses/LICENSE-2.0
13.44 +#
13.45 +# Unless required by applicable law or agreed to in writing, software
13.46 +# distributed under the License is distributed on an "AS IS" BASIS,
13.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13.48 +# See the License for the specific language governing permissions and
13.49 +# limitations under the License.
13.50 # ------------------------------------------------------------
13.51
13.52
14.1 --- a/OpenSecurity/bin/opensecurityd.pyw Wed Oct 29 15:02:42 2014 +0100
14.2 +++ b/OpenSecurity/bin/opensecurityd.pyw Wed Oct 29 15:18:22 2014 +0100
14.3 @@ -9,24 +9,33 @@
14.4 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
14.5 # Mihai Bartha, <mihai.bartha@ait.ac.at>
14.6 #
14.7 -# Copyright (C) 2013 AIT Austrian Institute of Technology
14.8 -# AIT Austrian Institute of Technology GmbH
14.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
14.10 -# http://www.ait.ac.at
14.11 -#
14.12 -# This program is free software; you can redistribute it and/or
14.13 -# modify it under the terms of the GNU General Public License
14.14 -# as published by the Free Software Foundation version 2.
14.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
14.16 #
14.17 -# This program is distributed in the hope that it will be useful,
14.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
14.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14.20 -# GNU General Public License for more details.
14.21 #
14.22 -# You should have received a copy of the GNU General Public License
14.23 -# along with this program; if not, write to the Free Software
14.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
14.25 -# Boston, MA 02110-1301, USA.
14.26 +# X-Net Services GmbH
14.27 +# Elisabethstrasse 1
14.28 +# 4020 Linz
14.29 +# AUSTRIA
14.30 +# https://www.x-net.at
14.31 +#
14.32 +# AIT Austrian Institute of Technology
14.33 +# Donau City Strasse 1
14.34 +# 1220 Wien
14.35 +# AUSTRIA
14.36 +# http://www.ait.ac.at
14.37 +#
14.38 +#
14.39 +# Licensed under the Apache License, Version 2.0 (the "License");
14.40 +# you may not use this file except in compliance with the License.
14.41 +# You may obtain a copy of the License at
14.42 +#
14.43 +# http://www.apache.org/licenses/LICENSE-2.0
14.44 +#
14.45 +# Unless required by applicable law or agreed to in writing, software
14.46 +# distributed under the License is distributed on an "AS IS" BASIS,
14.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14.48 +# See the License for the specific language governing permissions and
14.49 +# limitations under the License.
14.50 # ------------------------------------------------------------
14.51
14.52
15.1 --- a/OpenSecurity/bin/proxy_getter.py Wed Oct 29 15:02:42 2014 +0100
15.2 +++ b/OpenSecurity/bin/proxy_getter.py Wed Oct 29 15:18:22 2014 +0100
15.3 @@ -1,3 +1,39 @@
15.4 +# ------------------------------------------------------------
15.5 +# proxy_getter
15.6 +#
15.7 +# Aquire the correct proxy settings of the current machine
15.8 +#
15.9 +# Autor: Mihai Bartha, <mihai.bartha@ait.ac.at>
15.10 +#
15.11 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
15.12 +#
15.13 +#
15.14 +# X-Net Services GmbH
15.15 +# Elisabethstrasse 1
15.16 +# 4020 Linz
15.17 +# AUSTRIA
15.18 +# https://www.x-net.at
15.19 +#
15.20 +# AIT Austrian Institute of Technology
15.21 +# Donau City Strasse 1
15.22 +# 1220 Wien
15.23 +# AUSTRIA
15.24 +# http://www.ait.ac.at
15.25 +#
15.26 +#
15.27 +# Licensed under the Apache License, Version 2.0 (the "License");
15.28 +# you may not use this file except in compliance with the License.
15.29 +# You may obtain a copy of the License at
15.30 +#
15.31 +# http://www.apache.org/licenses/LICENSE-2.0
15.32 +#
15.33 +# Unless required by applicable law or agreed to in writing, software
15.34 +# distributed under the License is distributed on an "AS IS" BASIS,
15.35 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15.36 +# See the License for the specific language governing permissions and
15.37 +# limitations under the License.
15.38 +# ------------------------------------------------------------
15.39 +
15.40 import socket
15.41 import os
15.42 import httplib
15.43 @@ -102,4 +138,4 @@
15.44 return {'ProxyServer': proxies['ProxyServer']}
15.45 return {'ProxyServer': reg_entries['ProxyServer']}
15.46
15.47 - return None
15.48 \ No newline at end of file
15.49 + return None
16.1 --- a/OpenSecurity/bin/start_browsing.pyw Wed Oct 29 15:02:42 2014 +0100
16.2 +++ b/OpenSecurity/bin/start_browsing.pyw Wed Oct 29 15:18:22 2014 +0100
16.3 @@ -4,25 +4,35 @@
16.4 # directly start the browsing
16.5 #
16.6 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
16.7 +# Mihai Bartha, <mihai.bartha@ait.ac.at>
16.8 #
16.9 -# Copyright (C) 2013 AIT Austrian Institute of Technology
16.10 -# AIT Austrian Institute of Technology GmbH
16.11 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
16.12 -# http://www.ait.ac.at
16.13 -#
16.14 -# This program is free software; you can redistribute it and/or
16.15 -# modify it under the terms of the GNU General Public License
16.16 -# as published by the Free Software Foundation version 2.
16.17 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
16.18 #
16.19 -# This program is distributed in the hope that it will be useful,
16.20 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
16.21 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16.22 -# GNU General Public License for more details.
16.23 #
16.24 -# You should have received a copy of the GNU General Public License
16.25 -# along with this program; if not, write to the Free Software
16.26 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
16.27 -# Boston, MA 02110-1301, USA.
16.28 +# X-Net Services GmbH
16.29 +# Elisabethstrasse 1
16.30 +# 4020 Linz
16.31 +# AUSTRIA
16.32 +# https://www.x-net.at
16.33 +#
16.34 +# AIT Austrian Institute of Technology
16.35 +# Donau City Strasse 1
16.36 +# 1220 Wien
16.37 +# AUSTRIA
16.38 +# http://www.ait.ac.at
16.39 +#
16.40 +#
16.41 +# Licensed under the Apache License, Version 2.0 (the "License");
16.42 +# you may not use this file except in compliance with the License.
16.43 +# You may obtain a copy of the License at
16.44 +#
16.45 +# http://www.apache.org/licenses/LICENSE-2.0
16.46 +#
16.47 +# Unless required by applicable law or agreed to in writing, software
16.48 +# distributed under the License is distributed on an "AS IS" BASIS,
16.49 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16.50 +# See the License for the specific language governing permissions and
16.51 +# limitations under the License.
16.52 # ------------------------------------------------------------
16.53
16.54
17.1 --- a/OpenSecurity/bin/terminate_client_tray.pyw Wed Oct 29 15:02:42 2014 +0100
17.2 +++ b/OpenSecurity/bin/terminate_client_tray.pyw Wed Oct 29 15:18:22 2014 +0100
17.3 @@ -5,24 +5,33 @@
17.4 #
17.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
17.6 #
17.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
17.8 -# AIT Austrian Institute of Technology GmbH
17.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
17.10 -# http://www.ait.ac.at
17.11 -#
17.12 -# This program is free software; you can redistribute it and/or
17.13 -# modify it under the terms of the GNU General Public License
17.14 -# as published by the Free Software Foundation version 2.
17.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
17.16 #
17.17 -# This program is distributed in the hope that it will be useful,
17.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
17.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17.20 -# GNU General Public License for more details.
17.21 #
17.22 -# You should have received a copy of the GNU General Public License
17.23 -# along with this program; if not, write to the Free Software
17.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
17.25 -# Boston, MA 02110-1301, USA.
17.26 +# X-Net Services GmbH
17.27 +# Elisabethstrasse 1
17.28 +# 4020 Linz
17.29 +# AUSTRIA
17.30 +# https://www.x-net.at
17.31 +#
17.32 +# AIT Austrian Institute of Technology
17.33 +# Donau City Strasse 1
17.34 +# 1220 Wien
17.35 +# AUSTRIA
17.36 +# http://www.ait.ac.at
17.37 +#
17.38 +#
17.39 +# Licensed under the Apache License, Version 2.0 (the "License");
17.40 +# you may not use this file except in compliance with the License.
17.41 +# You may obtain a copy of the License at
17.42 +#
17.43 +# http://www.apache.org/licenses/LICENSE-2.0
17.44 +#
17.45 +# Unless required by applicable law or agreed to in writing, software
17.46 +# distributed under the License is distributed on an "AS IS" BASIS,
17.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17.48 +# See the License for the specific language governing permissions and
17.49 +# limitations under the License.
17.50 # ------------------------------------------------------------
17.51
17.52
18.1 --- a/OpenSecurity/bin/test_vmmanager.pyw Wed Oct 29 15:02:42 2014 +0100
18.2 +++ b/OpenSecurity/bin/test_vmmanager.pyw Wed Oct 29 15:18:22 2014 +0100
18.3 @@ -2,30 +2,39 @@
18.4 # -*- coding: utf-8 -*-
18.5
18.6 # ------------------------------------------------------------
18.7 -# opensecurityd
18.8 +# test_vmmanger
18.9 +#
18.10 +# test the open security vmmanager
18.11 #
18.12 -# the opensecurityd as RESTful server
18.13 -#
18.14 # Autor: Mihai Bartha, <mihai.bartha@ait.ac.at>
18.15 #
18.16 -# Copyright (C) 2013 AIT Austrian Institute of Technology
18.17 -# AIT Austrian Institute of Technology GmbH
18.18 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
18.19 -# http://www.ait.ac.at
18.20 -#
18.21 -# This program is free software; you can redistribute it and/or
18.22 -# modify it under the terms of the GNU General Public License
18.23 -# as published by the Free Software Foundation version 2.
18.24 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
18.25 #
18.26 -# This program is distributed in the hope that it will be useful,
18.27 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
18.28 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18.29 -# GNU General Public License for more details.
18.30 #
18.31 -# You should have received a copy of the GNU General Public License
18.32 -# along with this program; if not, write to the Free Software
18.33 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
18.34 -# Boston, MA 02110-1301, USA.
18.35 +# X-Net Services GmbH
18.36 +# Elisabethstrasse 1
18.37 +# 4020 Linz
18.38 +# AUSTRIA
18.39 +# https://www.x-net.at
18.40 +#
18.41 +# AIT Austrian Institute of Technology
18.42 +# Donau City Strasse 1
18.43 +# 1220 Wien
18.44 +# AUSTRIA
18.45 +# http://www.ait.ac.at
18.46 +#
18.47 +#
18.48 +# Licensed under the Apache License, Version 2.0 (the "License");
18.49 +# you may not use this file except in compliance with the License.
18.50 +# You may obtain a copy of the License at
18.51 +#
18.52 +# http://www.apache.org/licenses/LICENSE-2.0
18.53 +#
18.54 +# Unless required by applicable law or agreed to in writing, software
18.55 +# distributed under the License is distributed on an "AS IS" BASIS,
18.56 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18.57 +# See the License for the specific language governing permissions and
18.58 +# limitations under the License.
18.59 # ------------------------------------------------------------
18.60
18.61
18.62 @@ -227,4 +236,4 @@
18.63
18.64
18.65 #cmd = "c:\\cygwin64\\bin\\bash.exe --login -c \"/bin/ls\""
18.66 - #man.execute(cmd)
18.67 \ No newline at end of file
18.68 + #man.execute(cmd)
19.1 --- a/OpenSecurity/bin/ui/__init__.py Wed Oct 29 15:02:42 2014 +0100
19.2 +++ b/OpenSecurity/bin/ui/__init__.py Wed Oct 29 15:18:22 2014 +0100
19.3 @@ -8,24 +8,33 @@
19.4 #
19.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
19.6 #
19.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
19.8 -# AIT Austrian Institute of Technology GmbH
19.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
19.10 -# http://www.ait.ac.at
19.11 -#
19.12 -# This program is free software; you can redistribute it and/or
19.13 -# modify it under the terms of the GNU General Public License
19.14 -# as published by the Free Software Foundation version 2.
19.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
19.16 #
19.17 -# This program is distributed in the hope that it will be useful,
19.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
19.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19.20 -# GNU General Public License for more details.
19.21 #
19.22 -# You should have received a copy of the GNU General Public License
19.23 -# along with this program; if not, write to the Free Software
19.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
19.25 -# Boston, MA 02110-1301, USA.
19.26 +# X-Net Services GmbH
19.27 +# Elisabethstrasse 1
19.28 +# 4020 Linz
19.29 +# AUSTRIA
19.30 +# https://www.x-net.at
19.31 +#
19.32 +# AIT Austrian Institute of Technology
19.33 +# Donau City Strasse 1
19.34 +# 1220 Wien
19.35 +# AUSTRIA
19.36 +# http://www.ait.ac.at
19.37 +#
19.38 +#
19.39 +# Licensed under the Apache License, Version 2.0 (the "License");
19.40 +# you may not use this file except in compliance with the License.
19.41 +# You may obtain a copy of the License at
19.42 +#
19.43 +# http://www.apache.org/licenses/LICENSE-2.0
19.44 +#
19.45 +# Unless required by applicable law or agreed to in writing, software
19.46 +# distributed under the License is distributed on an "AS IS" BASIS,
19.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
19.48 +# See the License for the specific language governing permissions and
19.49 +# limitations under the License.
19.50 # ------------------------------------------------------------
19.51
19.52
20.1 --- a/OpenSecurity/bin/ui/about_dialog.py Wed Oct 29 15:02:42 2014 +0100
20.2 +++ b/OpenSecurity/bin/ui/about_dialog.py Wed Oct 29 15:18:22 2014 +0100
20.3 @@ -8,24 +8,33 @@
20.4 #
20.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
20.6 #
20.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
20.8 -# AIT Austrian Institute of Technology GmbH
20.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
20.10 -# http://www.ait.ac.at
20.11 -#
20.12 -# This program is free software; you can redistribute it and/or
20.13 -# modify it under the terms of the GNU General Public License
20.14 -# as published by the Free Software Foundation version 2.
20.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
20.16 #
20.17 -# This program is distributed in the hope that it will be useful,
20.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
20.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20.20 -# GNU General Public License for more details.
20.21 #
20.22 -# You should have received a copy of the GNU General Public License
20.23 -# along with this program; if not, write to the Free Software
20.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
20.25 -# Boston, MA 02110-1301, USA.
20.26 +# X-Net Services GmbH
20.27 +# Elisabethstrasse 1
20.28 +# 4020 Linz
20.29 +# AUSTRIA
20.30 +# https://www.x-net.at
20.31 +#
20.32 +# AIT Austrian Institute of Technology
20.33 +# Donau City Strasse 1
20.34 +# 1220 Wien
20.35 +# AUSTRIA
20.36 +# http://www.ait.ac.at
20.37 +#
20.38 +#
20.39 +# Licensed under the Apache License, Version 2.0 (the "License");
20.40 +# you may not use this file except in compliance with the License.
20.41 +# You may obtain a copy of the License at
20.42 +#
20.43 +# http://www.apache.org/licenses/LICENSE-2.0
20.44 +#
20.45 +# Unless required by applicable law or agreed to in writing, software
20.46 +# distributed under the License is distributed on an "AS IS" BASIS,
20.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
20.48 +# See the License for the specific language governing permissions and
20.49 +# limitations under the License.
20.50 # ------------------------------------------------------------
20.51
20.52
21.1 --- a/OpenSecurity/bin/ui/configure_dialog.py Wed Oct 29 15:02:42 2014 +0100
21.2 +++ b/OpenSecurity/bin/ui/configure_dialog.py Wed Oct 29 15:18:22 2014 +0100
21.3 @@ -8,24 +8,33 @@
21.4 #
21.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
21.6 #
21.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
21.8 -# AIT Austrian Institute of Technology GmbH
21.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
21.10 -# http://www.ait.ac.at
21.11 -#
21.12 -# This program is free software; you can redistribute it and/or
21.13 -# modify it under the terms of the GNU General Public License
21.14 -# as published by the Free Software Foundation version 2.
21.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
21.16 #
21.17 -# This program is distributed in the hope that it will be useful,
21.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
21.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21.20 -# GNU General Public License for more details.
21.21 #
21.22 -# You should have received a copy of the GNU General Public License
21.23 -# along with this program; if not, write to the Free Software
21.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
21.25 -# Boston, MA 02110-1301, USA.
21.26 +# X-Net Services GmbH
21.27 +# Elisabethstrasse 1
21.28 +# 4020 Linz
21.29 +# AUSTRIA
21.30 +# https://www.x-net.at
21.31 +#
21.32 +# AIT Austrian Institute of Technology
21.33 +# Donau City Strasse 1
21.34 +# 1220 Wien
21.35 +# AUSTRIA
21.36 +# http://www.ait.ac.at
21.37 +#
21.38 +#
21.39 +# Licensed under the Apache License, Version 2.0 (the "License");
21.40 +# you may not use this file except in compliance with the License.
21.41 +# You may obtain a copy of the License at
21.42 +#
21.43 +# http://www.apache.org/licenses/LICENSE-2.0
21.44 +#
21.45 +# Unless required by applicable law or agreed to in writing, software
21.46 +# distributed under the License is distributed on an "AS IS" BASIS,
21.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
21.48 +# See the License for the specific language governing permissions and
21.49 +# limitations under the License.
21.50 # ------------------------------------------------------------
21.51
21.52
22.1 --- a/OpenSecurity/bin/ui/credentials_dialog.py Wed Oct 29 15:02:42 2014 +0100
22.2 +++ b/OpenSecurity/bin/ui/credentials_dialog.py Wed Oct 29 15:18:22 2014 +0100
22.3 @@ -8,24 +8,33 @@
22.4 #
22.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
22.6 #
22.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
22.8 -# AIT Austrian Institute of Technology GmbH
22.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
22.10 -# http://www.ait.ac.at
22.11 -#
22.12 -# This program is free software; you can redistribute it and/or
22.13 -# modify it under the terms of the GNU General Public License
22.14 -# as published by the Free Software Foundation version 2.
22.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
22.16 #
22.17 -# This program is distributed in the hope that it will be useful,
22.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
22.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22.20 -# GNU General Public License for more details.
22.21 #
22.22 -# You should have received a copy of the GNU General Public License
22.23 -# along with this program; if not, write to the Free Software
22.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
22.25 -# Boston, MA 02110-1301, USA.
22.26 +# X-Net Services GmbH
22.27 +# Elisabethstrasse 1
22.28 +# 4020 Linz
22.29 +# AUSTRIA
22.30 +# https://www.x-net.at
22.31 +#
22.32 +# AIT Austrian Institute of Technology
22.33 +# Donau City Strasse 1
22.34 +# 1220 Wien
22.35 +# AUSTRIA
22.36 +# http://www.ait.ac.at
22.37 +#
22.38 +#
22.39 +# Licensed under the Apache License, Version 2.0 (the "License");
22.40 +# you may not use this file except in compliance with the License.
22.41 +# You may obtain a copy of the License at
22.42 +#
22.43 +# http://www.apache.org/licenses/LICENSE-2.0
22.44 +#
22.45 +# Unless required by applicable law or agreed to in writing, software
22.46 +# distributed under the License is distributed on an "AS IS" BASIS,
22.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
22.48 +# See the License for the specific language governing permissions and
22.49 +# limitations under the License.
22.50 # ------------------------------------------------------------
22.51
22.52
23.1 --- a/OpenSecurity/bin/ui/format_drive_dialog.py Wed Oct 29 15:02:42 2014 +0100
23.2 +++ b/OpenSecurity/bin/ui/format_drive_dialog.py Wed Oct 29 15:18:22 2014 +0100
23.3 @@ -8,24 +8,33 @@
23.4 #
23.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
23.6 #
23.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
23.8 -# AIT Austrian Institute of Technology GmbH
23.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
23.10 -# http://www.ait.ac.at
23.11 -#
23.12 -# This program is free software; you can redistribute it and/or
23.13 -# modify it under the terms of the GNU General Public License
23.14 -# as published by the Free Software Foundation version 2.
23.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
23.16 #
23.17 -# This program is distributed in the hope that it will be useful,
23.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
23.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23.20 -# GNU General Public License for more details.
23.21 #
23.22 -# You should have received a copy of the GNU General Public License
23.23 -# along with this program; if not, write to the Free Software
23.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
23.25 -# Boston, MA 02110-1301, USA.
23.26 +# X-Net Services GmbH
23.27 +# Elisabethstrasse 1
23.28 +# 4020 Linz
23.29 +# AUSTRIA
23.30 +# https://www.x-net.at
23.31 +#
23.32 +# AIT Austrian Institute of Technology
23.33 +# Donau City Strasse 1
23.34 +# 1220 Wien
23.35 +# AUSTRIA
23.36 +# http://www.ait.ac.at
23.37 +#
23.38 +#
23.39 +# Licensed under the Apache License, Version 2.0 (the "License");
23.40 +# you may not use this file except in compliance with the License.
23.41 +# You may obtain a copy of the License at
23.42 +#
23.43 +# http://www.apache.org/licenses/LICENSE-2.0
23.44 +#
23.45 +# Unless required by applicable law or agreed to in writing, software
23.46 +# distributed under the License is distributed on an "AS IS" BASIS,
23.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
23.48 +# See the License for the specific language governing permissions and
23.49 +# limitations under the License.
23.50 # ------------------------------------------------------------
23.51
23.52
24.1 --- a/OpenSecurity/bin/ui/keyfile_dialog.py Wed Oct 29 15:02:42 2014 +0100
24.2 +++ b/OpenSecurity/bin/ui/keyfile_dialog.py Wed Oct 29 15:18:22 2014 +0100
24.3 @@ -8,24 +8,33 @@
24.4 #
24.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
24.6 #
24.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
24.8 -# AIT Austrian Institute of Technology GmbH
24.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
24.10 -# http://www.ait.ac.at
24.11 -#
24.12 -# This program is free software; you can redistribute it and/or
24.13 -# modify it under the terms of the GNU General Public License
24.14 -# as published by the Free Software Foundation version 2.
24.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
24.16 #
24.17 -# This program is distributed in the hope that it will be useful,
24.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
24.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24.20 -# GNU General Public License for more details.
24.21 #
24.22 -# You should have received a copy of the GNU General Public License
24.23 -# along with this program; if not, write to the Free Software
24.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
24.25 -# Boston, MA 02110-1301, USA.
24.26 +# X-Net Services GmbH
24.27 +# Elisabethstrasse 1
24.28 +# 4020 Linz
24.29 +# AUSTRIA
24.30 +# https://www.x-net.at
24.31 +#
24.32 +# AIT Austrian Institute of Technology
24.33 +# Donau City Strasse 1
24.34 +# 1220 Wien
24.35 +# AUSTRIA
24.36 +# http://www.ait.ac.at
24.37 +#
24.38 +#
24.39 +# Licensed under the Apache License, Version 2.0 (the "License");
24.40 +# you may not use this file except in compliance with the License.
24.41 +# You may obtain a copy of the License at
24.42 +#
24.43 +# http://www.apache.org/licenses/LICENSE-2.0
24.44 +#
24.45 +# Unless required by applicable law or agreed to in writing, software
24.46 +# distributed under the License is distributed on an "AS IS" BASIS,
24.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
24.48 +# See the License for the specific language governing permissions and
24.49 +# limitations under the License.
24.50 # ------------------------------------------------------------
24.51
24.52
25.1 --- a/OpenSecurity/bin/ui/launch_dialog.py Wed Oct 29 15:02:42 2014 +0100
25.2 +++ b/OpenSecurity/bin/ui/launch_dialog.py Wed Oct 29 15:18:22 2014 +0100
25.3 @@ -8,24 +8,33 @@
25.4 #
25.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
25.6 #
25.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
25.8 -# AIT Austrian Institute of Technology GmbH
25.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
25.10 -# http://www.ait.ac.at
25.11 -#
25.12 -# This program is free software; you can redistribute it and/or
25.13 -# modify it under the terms of the GNU General Public License
25.14 -# as published by the Free Software Foundation version 2.
25.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
25.16 #
25.17 -# This program is distributed in the hope that it will be useful,
25.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
25.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25.20 -# GNU General Public License for more details.
25.21 #
25.22 -# You should have received a copy of the GNU General Public License
25.23 -# along with this program; if not, write to the Free Software
25.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
25.25 -# Boston, MA 02110-1301, USA.
25.26 +# X-Net Services GmbH
25.27 +# Elisabethstrasse 1
25.28 +# 4020 Linz
25.29 +# AUSTRIA
25.30 +# https://www.x-net.at
25.31 +#
25.32 +# AIT Austrian Institute of Technology
25.33 +# Donau City Strasse 1
25.34 +# 1220 Wien
25.35 +# AUSTRIA
25.36 +# http://www.ait.ac.at
25.37 +#
25.38 +#
25.39 +# Licensed under the Apache License, Version 2.0 (the "License");
25.40 +# you may not use this file except in compliance with the License.
25.41 +# You may obtain a copy of the License at
25.42 +#
25.43 +# http://www.apache.org/licenses/LICENSE-2.0
25.44 +#
25.45 +# Unless required by applicable law or agreed to in writing, software
25.46 +# distributed under the License is distributed on an "AS IS" BASIS,
25.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
25.48 +# See the License for the specific language governing permissions and
25.49 +# limitations under the License.
25.50 # ------------------------------------------------------------
25.51
25.52
26.1 --- a/OpenSecurity/bin/ui/notification_dialog.py Wed Oct 29 15:02:42 2014 +0100
26.2 +++ b/OpenSecurity/bin/ui/notification_dialog.py Wed Oct 29 15:18:22 2014 +0100
26.3 @@ -8,24 +8,33 @@
26.4 #
26.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
26.6 #
26.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
26.8 -# AIT Austrian Institute of Technology GmbH
26.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
26.10 -# http://www.ait.ac.at
26.11 -#
26.12 -# This program is free software; you can redistribute it and/or
26.13 -# modify it under the terms of the GNU General Public License
26.14 -# as published by the Free Software Foundation version 2.
26.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
26.16 #
26.17 -# This program is distributed in the hope that it will be useful,
26.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
26.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26.20 -# GNU General Public License for more details.
26.21 #
26.22 -# You should have received a copy of the GNU General Public License
26.23 -# along with this program; if not, write to the Free Software
26.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
26.25 -# Boston, MA 02110-1301, USA.
26.26 +# X-Net Services GmbH
26.27 +# Elisabethstrasse 1
26.28 +# 4020 Linz
26.29 +# AUSTRIA
26.30 +# https://www.x-net.at
26.31 +#
26.32 +# AIT Austrian Institute of Technology
26.33 +# Donau City Strasse 1
26.34 +# 1220 Wien
26.35 +# AUSTRIA
26.36 +# http://www.ait.ac.at
26.37 +#
26.38 +#
26.39 +# Licensed under the Apache License, Version 2.0 (the "License");
26.40 +# you may not use this file except in compliance with the License.
26.41 +# You may obtain a copy of the License at
26.42 +#
26.43 +# http://www.apache.org/licenses/LICENSE-2.0
26.44 +#
26.45 +# Unless required by applicable law or agreed to in writing, software
26.46 +# distributed under the License is distributed on an "AS IS" BASIS,
26.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
26.48 +# See the License for the specific language governing permissions and
26.49 +# limitations under the License.
26.50 # ------------------------------------------------------------
26.51
26.52
27.1 --- a/OpenSecurity/bin/ui/password_dialog.py Wed Oct 29 15:02:42 2014 +0100
27.2 +++ b/OpenSecurity/bin/ui/password_dialog.py Wed Oct 29 15:18:22 2014 +0100
27.3 @@ -8,24 +8,33 @@
27.4 #
27.5 # Autor: Oliver Maurhart, <oliver.maurhart@ait.ac.at>
27.6 #
27.7 -# Copyright (C) 2014 AIT Austrian Institute of Technology
27.8 -# AIT Austrian Institute of Technology GmbH
27.9 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
27.10 -# http://www.ait.ac.at
27.11 -#
27.12 -# This program is free software; you can redistribute it and/or
27.13 -# modify it under the terms of the GNU General Public License
27.14 -# as published by the Free Software Foundation version 2.
27.15 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
27.16 #
27.17 -# This program is distributed in the hope that it will be useful,
27.18 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
27.19 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27.20 -# GNU General Public License for more details.
27.21 #
27.22 -# You should have received a copy of the GNU General Public License
27.23 -# along with this program; if not, write to the Free Software
27.24 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
27.25 -# Boston, MA 02110-1301, USA.
27.26 +# X-Net Services GmbH
27.27 +# Elisabethstrasse 1
27.28 +# 4020 Linz
27.29 +# AUSTRIA
27.30 +# https://www.x-net.at
27.31 +#
27.32 +# AIT Austrian Institute of Technology
27.33 +# Donau City Strasse 1
27.34 +# 1220 Wien
27.35 +# AUSTRIA
27.36 +# http://www.ait.ac.at
27.37 +#
27.38 +#
27.39 +# Licensed under the Apache License, Version 2.0 (the "License");
27.40 +# you may not use this file except in compliance with the License.
27.41 +# You may obtain a copy of the License at
27.42 +#
27.43 +# http://www.apache.org/licenses/LICENSE-2.0
27.44 +#
27.45 +# Unless required by applicable law or agreed to in writing, software
27.46 +# distributed under the License is distributed on an "AS IS" BASIS,
27.47 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
27.48 +# See the License for the specific language governing permissions and
27.49 +# limitations under the License.
27.50 # ------------------------------------------------------------
27.51
27.52
28.1 --- a/OpenSecurity/bin/vmmanager.pyw Wed Oct 29 15:02:42 2014 +0100
28.2 +++ b/OpenSecurity/bin/vmmanager.pyw Wed Oct 29 15:18:22 2014 +0100
28.3 @@ -2,30 +2,39 @@
28.4 # -*- coding: utf-8 -*-
28.5
28.6 # ------------------------------------------------------------
28.7 -# opensecurityd
28.8 +# the VMManager
28.9 #
28.10 -# the opensecurityd as RESTful server
28.11 +# management of the Virtual Machines
28.12 #
28.13 # Autor: Mihai Bartha, <mihai.bartha@ait.ac.at>
28.14 #
28.15 -# Copyright (C) 2013 AIT Austrian Institute of Technology
28.16 -# AIT Austrian Institute of Technology GmbH
28.17 -# Donau-City-Strasse 1 | 1220 Vienna | Austria
28.18 -# http://www.ait.ac.at
28.19 -#
28.20 -# This program is free software; you can redistribute it and/or
28.21 -# modify it under the terms of the GNU General Public License
28.22 -# as published by the Free Software Foundation version 2.
28.23 +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology
28.24 #
28.25 -# This program is distributed in the hope that it will be useful,
28.26 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
28.27 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28.28 -# GNU General Public License for more details.
28.29 #
28.30 -# You should have received a copy of the GNU General Public License
28.31 -# along with this program; if not, write to the Free Software
28.32 -# Foundation, Inc., 51 Franklin Street, Fifth Floor,
28.33 -# Boston, MA 02110-1301, USA.
28.34 +# X-Net Services GmbH
28.35 +# Elisabethstrasse 1
28.36 +# 4020 Linz
28.37 +# AUSTRIA
28.38 +# https://www.x-net.at
28.39 +#
28.40 +# AIT Austrian Institute of Technology
28.41 +# Donau City Strasse 1
28.42 +# 1220 Wien
28.43 +# AUSTRIA
28.44 +# http://www.ait.ac.at
28.45 +#
28.46 +#
28.47 +# Licensed under the Apache License, Version 2.0 (the "License");
28.48 +# you may not use this file except in compliance with the License.
28.49 +# You may obtain a copy of the License at
28.50 +#
28.51 +# http://www.apache.org/licenses/LICENSE-2.0
28.52 +#
28.53 +# Unless required by applicable law or agreed to in writing, software
28.54 +# distributed under the License is distributed on an "AS IS" BASIS,
28.55 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
28.56 +# See the License for the specific language governing permissions and
28.57 +# limitations under the License.
28.58 # ------------------------------------------------------------
28.59
28.60
28.61 @@ -1197,4 +1206,4 @@
28.62 self.vmm.updateTemplate()
28.63 except:
28.64 import_logger.info("Initial import failed. Refer to service log for details.")
28.65 - self.vmm.start(force=True)
28.66 \ No newline at end of file
28.67 + self.vmm.start(force=True)