1.1 --- a/OpenSecurity/bin/download_initial_image.sh	Wed Apr 23 14:55:02 2014 +0200
     1.2 +++ b/OpenSecurity/bin/download_initial_image.sh	Thu Apr 24 12:19:30 2014 +0200
     1.3 @@ -3,7 +3,7 @@
     1.4  # ------------------------------------------------------------
     1.5  # download initial VM for
     1.6  #
     1.7 -#       OpenSecurity V0.2.4
     1.8 +#       OpenSecurity V0.2.5
     1.9  #
    1.10  # (C)opyright 2014, AIT Austrian Instiitute of Technology
    1.11  # ------------------------------------------------------------

     2.1 --- a/OpenSecurity/bin/initial_vm.sh	Wed Apr 23 14:55:02 2014 +0200
     2.2 +++ b/OpenSecurity/bin/initial_vm.sh	Thu Apr 24 12:19:30 2014 +0200
     2.3 @@ -3,7 +3,7 @@
     2.4  # ------------------------------------------------------------
     2.5  # install the initial VM for 
     2.6  #
     2.7 -#       OpenSecurity V0.2.4
     2.8 +#       OpenSecurity V0.2.5
     2.9  #
    2.10  # This has been originally a Windows only BAT file.
    2.11  #

     3.1 --- a/OpenSecurity/bin/opensecurity_client_restful_server.py	Wed Apr 23 14:55:02 2014 +0200
     3.2 +++ b/OpenSecurity/bin/opensecurity_client_restful_server.py	Thu Apr 24 12:19:30 2014 +0200
     3.3 @@ -51,7 +51,7 @@
     3.4  # const
     3.5  
     3.6  
     3.7 -__version__ = "0.2.4"
     3.8 +__version__ = "0.2.5"
     3.9  
    3.10  
    3.11  """All the URLs we know mapping to class handler"""

     4.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Wed Apr 23 14:55:02 2014 +0200
     4.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Thu Apr 24 12:19:30 2014 +0200
     4.3 @@ -32,6 +32,7 @@
     4.4  # ------------------------------------------------------------
     4.5  # imports
     4.6  
     4.7 +import json
     4.8  import os
     4.9  import os.path
    4.10  import subprocess
    4.11 @@ -50,7 +51,7 @@
    4.12  # ------------------------------------------------------------
    4.13  # const
    4.14  
    4.15 -__version__ = "0.2.4"
    4.16 +__version__ = "0.2.5"
    4.17  
    4.18  
    4.19  """All the URLs we know mapping to class handler"""
    4.20 @@ -178,12 +179,34 @@
    4.21      def GET(self):
    4.22          log_call(web.ctx.environ)
    4.23          global gvm_mgr
    4.24 +
    4.25 +        # create a json string and pretty print it
    4.26          res = '{"os_server": { '
    4.27 -        res += '"version": "' + __version__ + '", '
    4.28 -        res += '"virtual box systemproperties": ' + str(gvm_mgr.systemProperties).replace("'", '"') + ', '
    4.29 -        res += '"current temporary folder": "' + tempfile.gettempdir().replace('\\', '\\\\') + '" '
    4.30 +        res += '"version": "' + __version__ + '" '
    4.31 +        res += ', "virtual box systemproperties": ' + str(gvm_mgr.systemProperties).replace("'", '"') 
    4.32 +        res += ', "current temporary folder": "' + tempfile.gettempdir().replace('\\', '\\\\') + '"'
    4.33 +
    4.34 +        try:
    4.35 +            res += ', "whoami": "' + Cygwin.bashExecute('whoami')[1].strip() + '"'
    4.36 +        except:
    4.37 +            res += ', "whoami": "FAILED"'
    4.38 +
    4.39 +        try:
    4.40 +            res += ', "mount": ' + str(Cygwin.bashExecute('mount')[1].split('\n')[:-1]).replace("'", '"')
    4.41 +        except:
    4.42 +            res += ', "mount": "FAILED"'
    4.43 +
    4.44 +        try:
    4.45 +            res += ', "cygpath --windows ~": "' + Cygwin.bashExecute('cygpath --windows ~')[1].strip().replace('\\', '\\\\') + '"'
    4.46 +        except:
    4.47 +            res += ', "cygpath --windows ~": "FAILED"'
    4.48 +
    4.49          res += '}}'
    4.50 -        return res
    4.51 +
    4.52 +        # loading it into json and print it again ensures
    4.53 +        # we really do have a valid RFC conform json string
    4.54 +        # created (as long as the python json module is RFC conform)
    4.55 +        return json.dumps(json.loads(res), indent = 4)
    4.56  
    4.57  
    4.58  class os_sdvm:

     5.1 --- a/OpenSecurity/bin/ui/about_dialog.py	Wed Apr 23 14:55:02 2014 +0200
     5.2 +++ b/OpenSecurity/bin/ui/about_dialog.py	Thu Apr 24 12:19:30 2014 +0200
     5.3 @@ -63,7 +63,7 @@
     5.4  
     5.5  <h1 class="header">
     5.6      <a href="http://www.opensecurity.at"><img src=":/opensecurity/gfx/opensecurity_logo.jpg"/></a><br/><br/>
     5.7 -    OpenSecurity V0.2.4
     5.8 +    OpenSecurity V0.2.5
     5.9  </h1>
    5.10  
    5.11  <div class="about_text" align="justify">