opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#718: Parámetros de descripción finales para OGAgent. 

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5040 a21b9725-9963-47de-94b9-378ad31fedc9
remotes/github/oglive
ramon 2016-10-17 12:28:59 +00:00
parent cac2e5f609
commit 9bfb4eeeb2
12 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/build-packages.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=1.0.0 VERSION=1.1.0
RELEASE=1 RELEASE=1
top=`pwd` top=`pwd`

9
linux/debian/changelog
View File

@ -1,5 +1,12 @@
ogagent (1.0.0) stable; urgency=medium ogagent (1.0.0) stable; urgency=medium
* Initial release for OpenGnSys Agent * Initial release for OpenGnsys Agent
-- Adolfo Gómez García <agomez@virtualcable.es> Tue, 18 Jul 2015 03:18:22 +0200 -- Adolfo Gómez García <agomez@virtualcable.es> Tue, 18 Jul 2015 03:18:22 +0200
ogagent (1.1.0) stable; urgency=medium
* Functional OpenGnsys Agent interacting with OpenGnsys Server 1.1.0
-- Ramón M. Gómez <ramongomez@us.es> Tue, 13 Oct 2016 17:00:00 +0200

4
linux/debian/control
View File

@ -11,5 +11,5 @@ Section: admin
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: policykit-1(>=0.100), python-requests (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python-prctl(>=1.1.1), python (>=2.7), libxss1, ${misc:Depends} Depends: policykit-1(>=0.100), python-requests (>=0.8.2), python-qt4 (>=4.9), python-six(>=1.1), python-prctl(>=1.1.1), python (>=2.7), libxss1, ${misc:Depends}
Description: Agent for OpenGnSys Description: OpenGnsys Agent for Operating Systems
This package provides the required components to allow this machine to work on an environment managed by OpenGnSys. This package provides the required components to allow this machine to work on an environment managed by OpenGnsys.

6
linux/debian/copyright
View File

@ -1,7 +1,7 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
Name: udsactor Name: ogagent
Maintainer: Adolfo Gómez García Maintainer: Adolfo Gómez García
Source: http://www.udsenterprise.com/ Source: http://opengnsys.es
Copyright: 2014 Virtual Cable S.L.U. Copyright: 2014 Virtual Cable S.L.U.
License: BSD-3-clause License: BSD-3-clause
@ -23,4 +23,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
. .
On Debian systems, the full text of the GNU General Public On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'. `/usr/share/common-licenses/GPL-2'.

2
linux/debian/ogagent.init
View File

@ -5,7 +5,7 @@
# Required-Stop: $local_fs $remote_fs $network $syslog $named # Required-Stop: $local_fs $remote_fs $network $syslog $named
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: OpenGnSys Agent Service # Short-Description: OpenGnsys Agent Service
### END INIT INFO ### END INIT INFO
# #

4
linux/desktop/OGAgentTool.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=OpenGnSys Agent Tools Name=OpenGnsys Agent Tools
Comment=OpenGnSys Userspace tools Comment=OpenGnsys Userspace tools
Exec=/usr/bin/OGAgentTool-startup Exec=/usr/bin/OGAgentTool-startup
Icon=/usr/share/OGAgent/img/oga.png Icon=/usr/share/OGAgent/img/oga.png
Terminal=false Terminal=false

10
linux/ogagent-template.spec
View File

@ -8,12 +8,12 @@ BuildRoot: %{buildroot}
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
Release: %{release} Release: %{release}
Summary: OpenGnSys Agent & tools Summary: OpenGnsys Agent & tools
License: BSD3 License: BSD3
Group: Admin Group: Admin
Requires: python-six python-requests PyQt4 libXScrnSaver Requires: python-six python-requests PyQt4 libXScrnSaver
Vendor: Virtual Cable S.L.U. Vendor: OpenGnsys Project
URL: http://www.udsenterprise.com URL: http://opengnsys.es
Provides: ogagent Provides: ogagent
%define _rpmdir ../ %define _rpmdir ../
@ -47,11 +47,11 @@ if [ $1 -eq 0 ]; then
rm -rf /etc/ogagent rm -rf /etc/ogagent
rm /var/log/ogagent.log rm /var/log/ogagent.log
fi fi
# And, posibly, the .pyc leaved behind on /usr/share/UDSActor # And, posibly, the .pyc leaved behind on /usr/share/OGAgent
rm -rf /usr/share/OGAgent > /dev/null 2>&1 rm -rf /usr/share/OGAgent > /dev/null 2>&1
%description %description
This package provides the required components to allow this machine to work on an environment managed by OpenGnSys. This package provides the required components to allow this machine to work on an environment managed by OpenGnsys.
%files %files
%defattr(-,root,root) %defattr(-,root,root)

14
src/about-dialog.ui
View File

@ -65,7 +65,7 @@
<item> <item>
<widget class="QLabel" name="VersionLabel"> <widget class="QLabel" name="VersionLabel">
<property name="text"> <property name="text">
<string>Version 1.0.0</string> <string>Version 1.1.0</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -109,10 +109,12 @@
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;(c) 2014, Virtual Cable S.L.U.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;OpenGnsys Agent for Operating Systems (OGAgent) is based on UDS Actor from Virtual Cable S.L.U.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:5px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-weight:600;&quot;&gt;UDS Actor is (c) 2014, Virtual Cable S.L.U.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-style:italic;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-style:italic;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.udsenterprise.com&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opengnsys.es&lt;/span&gt;&lt;/a&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:8pt; color:#000000;&quot;&gt;More info:&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.openuds.org&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.udsenterprise.com&lt;/span&gt;&lt;/a&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:10px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://opengnsys.es/&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;OpenGnsys Project&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:10px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;https://github.com/dkmstr/openuds/tree/master&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;openuds on GitHub&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
@ -140,7 +142,9 @@ p, li { white-space: pre-wrap; }
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Verdana'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;Adolfo Gómez García &amp;lt;agomez@virtualcable.es&amp;gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;UDS Actor developer: Adolfo Gómez García &amp;lt;agomez@virtualcable.es&amp;gt;&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:5px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;OGAgent contributor: Ramón M. Gómez &amp;lt;ramongomez@us.es&amp;gt;&lt;/span&gt;&lt;/p&gt;
&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>

4
src/opengnsys/__init__.py
View File

@ -37,9 +37,9 @@ import six
import modules import modules
from RESTApi import REST, RESTError from RESTApi import REST, RESTError
VERSION = '1.0.0' VERSION = '1.1.0'
__title__ = 'OpenGnSys Agent' __title__ = 'OpenGnsys Agent'
__version__ = VERSION __version__ = VERSION
__build__ = 0x010750 __build__ = 0x010750
__author__ = 'Adolfo Gómez' __author__ = 'Adolfo Gómez'

8
src/opengnsys/windows/OGAgentService.py
View File

@ -49,12 +49,12 @@ from opengnsys.log import logger
class OGAgentSvc(win32serviceutil.ServiceFramework, CommonService): class OGAgentSvc(win32serviceutil.ServiceFramework, CommonService):
''' '''
This class represents a Windows Service for managing actor interactions This class represents a Windows Service for managing Agent interactions
with UDS Broker and Machine with OpenGnsys Server
''' '''
_svc_name_ = "OGAgent" _svc_name_ = "OGAgent"
_svc_display_name_ = "OpenGnSys Agent Service" _svc_display_name_ = "OpenGnsys Agent Service"
_svc_description_ = "OpenGnSys Agent for machines" _svc_description_ = "OpenGnsys Agent for Operating Systems"
# 'System Event Notification' is the SENS service # 'System Event Notification' is the SENS service
_svc_deps_ = ['EventLog'] _svc_deps_ = ['EventLog']

2
src/setup.py
View File

@ -30,7 +30,7 @@
@author: Adolfo Gómez, dkmaster at dkmon dot com @author: Adolfo Gómez, dkmaster at dkmon dot com
''' '''
VERSION = '1.0.0' VERSION = '1.1.0'
# ModuleFinder can't handle runtime changes to __path__, but win32com uses them # ModuleFinder can't handle runtime changes to __path__, but win32com uses them
try: try:

24
windows/ogagent.nsi
View File

@ -1,15 +1,15 @@
# We need http://nsis.sourceforge.net/NSIS_Simple_Firewall_Plugin # We need http://nsis.sourceforge.net/NSIS_Simple_Firewall_Plugin
# Copy inside the two x86_xxxxx folders inside nsis plugins folder # Copy inside the two x86_xxxxx folders inside nsis plugins folder
Name "OpenGnSys Agent" Name "OpenGnsys Agent"
# OpenGnsys Actor version # OpenGnsys Actor version
!define OGA_VERSION 1.0.0 !define OGA_VERSION 1.1.0
# General Symbol Definitions # General Symbol Definitions
!define REGKEY "SOFTWARE\OGAgent" !define REGKEY "SOFTWARE\OGAgent"
!define VERSION ${OGA_VERSION}.0 !define VERSION ${OGA_VERSION}.0
!define COMPANY "Virtual Cable S.L.U." !define COMPANY "OpenGnsys Project"
!define URL http://www.udsenterprise.com !define URL http://opengnsys.es
# MultiUser Symbol Definitions # MultiUser Symbol Definitions
!define MULTIUSER_EXECUTIONLEVEL Admin !define MULTIUSER_EXECUTIONLEVEL Admin
@ -56,7 +56,7 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE German !insertmacro MUI_LANGUAGE German
# Installer attributes # Installer attributes
BrandingText "OpenGnSys" BrandingText "OpenGnsys"
OutFile OGAgentSetup-${OGA_VERSION}.exe OutFile OGAgentSetup-${OGA_VERSION}.exe
InstallDir OGAgent InstallDir OGAgent
CRCCheck on CRCCheck on
@ -68,7 +68,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} ProductVersion "${VERSION}"
VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyName "${COMPANY}" VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyName "${COMPANY}"
VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyWebsite "${URL}" VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyWebsite "${URL}"
VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion "${VERSION}" VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion "${VERSION}"
VIAddVersionKey /LANG=${LANG_ENGLISH} FileDescription "OpenGnSys Agent installer" VIAddVersionKey /LANG=${LANG_ENGLISH} FileDescription "OpenGnsys Agent installer"
VIAddVersionKey /LANG=${LANG_ENGLISH} LegalCopyright "(c) 2015 Virtual Cable S.L.U." VIAddVersionKey /LANG=${LANG_ENGLISH} LegalCopyright "(c) 2015 Virtual Cable S.L.U."
InstallDirRegKey HKLM "${REGKEY}" Path InstallDirRegKey HKLM "${REGKEY}" Path
ShowUninstDetails show ShowUninstDetails show
@ -101,12 +101,12 @@ Section -post SEC0001
WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
ExecWait '"$INSTDIR\vcredist_x86.exe" /passive /norestart' ExecWait '"$INSTDIR\vcredist_x86.exe" /passive /norestart'
# Add the application to the firewall exception list - All Networks - All IP Version - Enabled # Add the application to the firewall exception list - All Networks - All IP Version - Enabled
# SimpleFC::AddApplication "OpenGnSys Agent Service" "$INSTDIR\OGAgentService.exe" 0 2 "" 1 # SimpleFC::AddApplication "OpenGnsys Agent Service" "$INSTDIR\OGAgentService.exe" 0 2 "" 1
# SimpleFC::AdvAddRule [name] [description] [protocol] [direction] # SimpleFC::AdvAddRule [name] [description] [protocol] [direction]
# [status] [profile] [action] [application] [service_name] [icmp_types_and_codes] # [status] [profile] [action] [application] [service_name] [icmp_types_and_codes]
# [group] [local_ports] [remote_ports] [local_address] [remote_address] # [group] [local_ports] [remote_ports] [local_address] [remote_address]
# #
SimpleFC::AdvAddRule "OpenGnSys Agent Firewall rules" "Firewall rules for OpenGnSys Agent interaction with broker." "6" "1" \ SimpleFC::AdvAddRule "OpenGnsys Agent Firewall rules" "Firewall rules for OpenGnsys Agent interaction with broker." "6" "1" \
"1" "7" "1" "$INSTDIR\OGAgentService.exe" "" "" \ "1" "7" "1" "$INSTDIR\OGAgentService.exe" "" "" \
"" "" "" "" "" "" "" "" "" ""
Pop $0 ; return error(1)/success(0) Pop $0 ; return error(1)/success(0)
@ -141,11 +141,11 @@ SectionEnd
Section -un.post UNSEC0001 Section -un.post UNSEC0001
# Remove application from the firewall exception list # Remove application from the firewall exception list
# SimpleFC::RemoveApplication "$INSTDIR\OGAgentService.exe" # SimpleFC::RemoveApplication "$INSTDIR\OGAgentService.exe"
SimpleFC::AdvRemoveRule "OpenGnSys Agent Firewall rules" SimpleFC::AdvRemoveRule "OpenGnsys Agent Firewall rules"
Pop $0 ; return error(1)/success(0) Pop $0 ; return error(1)/success(0)
SetShellVarContext current SetShellVarContext current
StrCpy $StartMenuGroup "OpenGnSys Agent" StrCpy $StartMenuGroup "OpenGnsys Agent"
DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^UninstallLink).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^UninstallLink).lnk"
Delete /REBOOTOK $INSTDIR\OGAgentUninstaller.exe Delete /REBOOTOK $INSTDIR\OGAgentUninstaller.exe
@ -163,7 +163,7 @@ SectionEnd
# Installer functions # Installer functions
Function .onInit Function .onInit
InitPluginsDir InitPluginsDir
StrCpy $StartMenuGroup "OpenGnSys Agent" StrCpy $StartMenuGroup "OpenGnsys Agent"
!insertmacro MUI_LANGDLL_DISPLAY !insertmacro MUI_LANGDLL_DISPLAY
!insertmacro MULTIUSER_INIT !insertmacro MULTIUSER_INIT
@ -171,7 +171,7 @@ FunctionEnd
# Uninstaller functions # Uninstaller functions
Function un.onInit Function un.onInit
StrCpy $StartMenuGroup "OpenGnSys Agent" StrCpy $StartMenuGroup "OpenGnsys Agent"
!insertmacro MUI_UNGETLANGUAGE !insertmacro MUI_UNGETLANGUAGE
!insertmacro MULTIUSER_UNINIT !insertmacro MULTIUSER_UNINIT
!insertmacro SELECT_UNSECTION Main ${UNSEC0000} !insertmacro SELECT_UNSECTION Main ${UNSEC0000}