[openrtm-commit:01709] r653 - in trunk/OpenRTM-aist-Python/OpenRTM_aist: . ext ext/ssl

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-02-01 20:21:45 +0900 (Mon, 01 Feb 2016)
New Revision: 653

Added:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/ssl/
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/ssl/SSLTransport.py
Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
Log:
[incompat,new_func,new_file,->RELENG_1_2] SSL encrypted connection has been implemented. refs #3409

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-02-01 11:17:34 UTC (rev 652)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2016-02-01 11:21:45 UTC (rev 653)
@@ -1327,7 +1327,20 @@
                                       tm)
 
 
-    
+    lmpm_ = [s.strip() for s in self._config.getProperty("manager.preload.modules").split(",")]
+    for mpm_ in lmpm_:
+      tmp = [mpm_]
+      OpenRTM_aist.eraseHeadBlank(tmp)
+      OpenRTM_aist.eraseTailBlank(tmp)
+      mpm_ = tmp[0]
+      if len(mpm_) == 0:
+        continue
+      basename_ = mpm_.split(".")[0]+"Init"
+      try:
+        self._module.load(mpm_, basename_)
+      except:
+        self._rtcout.RTC_ERROR(OpenRTM_aist.Logger.print_exception())
+
     return
 
 

Added: trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/ssl/SSLTransport.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/ssl/SSLTransport.py	                        (rev 0)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ext/ssl/SSLTransport.py	2016-02-01 11:21:45 UTC (rev 653)
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+# -*- coding: euc-jp -*-
+
+import os
+from omniORB import sslTP
+import OpenRTM_aist
+
+
+
+def SSLTransportInit(manager):
+
+    os.environ['ORBsslVerifyMode'] = "none"
+
+
+    prop = manager.getConfig()
+    certificate_authority_file = prop.getProperty("corba.ssl.certificate_authority_file")
+    key_file = prop.getProperty("corba.ssl.key_file")
+    key_file_password = prop.getProperty("corba.ssl.key_file_password")
+
+    corba_args = prop.getProperty("corba.args")
+    corba_args += " -ORBendPoint giop:ssl::"
+    if not OpenRTM_aist.toBool(prop.getProperty("manager.is_master"), "YES", "NO", True):
+        if len(prop.getProperty("corba.endpoints")) == 0:
+            if len(prop.getProperty("corba.endpoint")) == 0:
+                if str(prop.getProperty("corba.args")).find("-ORBendPoint") == -1:
+                    corba_args += " -ORBendPoint giop:tcp::"
+
+    
+    prop.setProperty("corba.args",corba_args)
+
+    
+    
+    
+    sslTP.certificate_authority_file(certificate_authority_file)
+    sslTP.key_file(key_file)
+    sslTP.key_file_password(key_file_password)
+    
\ No newline at end of file