Explorar el Código

[desktop] Move coerce_password_from_script

Erick Tryzelaar hace 9 años
padre
commit
1d6823f

+ 2 - 2
apps/beeswax/src/beeswax/conf.py

@@ -23,8 +23,8 @@ import beeswax.hive_site
 from django.utils.translation import ugettext_lazy as _t, ugettext as _
 
 from desktop.conf import default_ssl_cacerts, default_ssl_validate, AUTH_PASSWORD as DEFAULT_AUTH_PASSWORD,\
-  coerce_password_from_script, AUTH_USERNAME as DEFAULT_AUTH_USERNAME
-from desktop.lib.conf import ConfigSection, Config, coerce_bool
+  AUTH_USERNAME as DEFAULT_AUTH_USERNAME
+from desktop.lib.conf import ConfigSection, Config, coerce_bool, coerce_password_from_script
 from desktop.lib.exceptions import StructuredThriftTransportException
 
 from beeswax.settings import NICE_NAME

+ 2 - 2
apps/impala/src/impala/conf.py

@@ -21,8 +21,8 @@ import socket
 
 from django.utils.translation import ugettext_lazy as _t, ugettext as _
 from desktop.conf import default_ssl_cacerts, default_ssl_validate, AUTH_USERNAME as DEFAULT_AUTH_USERNAME,\
-  AUTH_PASSWORD as DEFAULT_AUTH_PASSWORD, coerce_password_from_script
-from desktop.lib.conf import ConfigSection, Config, coerce_bool
+  AUTH_PASSWORD as DEFAULT_AUTH_PASSWORD
+from desktop.lib.conf import ConfigSection, Config, coerce_bool, coerce_password_from_script
 from desktop.lib.exceptions import StructuredThriftTransportException
 
 from impala.settings import NICE_NAME

+ 4 - 17
desktop/core/src/desktop/conf.py

@@ -20,14 +20,14 @@ import logging
 import os
 import socket
 import stat
-import subprocess
 
 from django.utils.translation import ugettext_lazy as _
 
 from desktop.redaction.engine import parse_redaction_policy_from_file
 from desktop.lib.conf import Config, ConfigSection, UnspecifiedConfigSection,\
                              coerce_bool, coerce_csv, coerce_json_dict,\
-                             validate_path, list_of_compiled_res, coerce_str_lowercase
+                             validate_path, list_of_compiled_res, coerce_str_lowercase, \
+                             coerce_password_from_script
 from desktop.lib.i18n import force_unicode
 from desktop.lib.paths import get_desktop_root
 
@@ -52,25 +52,12 @@ def coerce_port(port):
   else:
     return port
 
+
 def coerce_file(path):
   if path and not os.path.isfile(path):
     raise Exception('File %s does not exist.' % path)
   return path
 
-def coerce_password_from_script(script):
-  p = subprocess.Popen(script, shell=True, stdout=subprocess.PIPE)
-  stdout, stderr = p.communicate()
-
-  if p.returncode != 0:
-    if os.environ.get('HUE_IGNORE_PASSWORD_SCRIPT_ERRORS') is None:
-      raise subprocess.CalledProcessError(p.returncode, script)
-    else:
-      return None
-
-  # whitespace may be significant in the password, but most files have a
-  # trailing newline.
-  return stdout.strip('\n')
-
 
 def coerce_timedelta(value):
   return datetime.timedelta(seconds=int(value))
@@ -146,7 +133,7 @@ SSL_CIPHER_LIST = Config(
 
 SSL_PASSWORD = Config(
   key="ssl_password",
-  help=_("SSL password of the the certificate"),
+  help=_("SSL password of the certificate"),
   default=None)
 
 SSL_PASSWORD_SCRIPT = Config(

+ 15 - 0
desktop/core/src/desktop/lib/conf.py

@@ -75,6 +75,7 @@ import logging
 import os
 import textwrap
 import re
+import subprocess
 import sys
 
 try:
@@ -701,3 +702,17 @@ def validate_thrift_transport(confvar):
     return error_res
 
   return []
+
+def coerce_password_from_script(script):
+  p = subprocess.Popen(script, shell=True, stdout=subprocess.PIPE)
+  stdout, stderr = p.communicate()
+
+  if p.returncode != 0:
+    if os.environ.get('HUE_IGNORE_PASSWORD_SCRIPT_ERRORS') is None:
+      raise subprocess.CalledProcessError(p.returncode, script)
+    else:
+      return None
+
+  # whitespace may be significant in the password, but most files have a
+  # trailing newline.
+  return stdout.strip('\n')

+ 3 - 2
desktop/libs/librdbms/src/librdbms/conf.py

@@ -17,8 +17,9 @@
 
 from django.utils.translation import ugettext_lazy as _t, ugettext as _
 from desktop.lib.conf import Config, UnspecifiedConfigSection,\
-                             ConfigSection, coerce_json_dict
-from desktop.conf import coerce_database, coerce_password_from_script
+                             ConfigSection, coerce_json_dict,\
+                             coerce_password_from_script
+from desktop.conf import coerce_database
 
 
 DATABASES = UnspecifiedConfigSection(

+ 2 - 2
desktop/libs/metadata/src/metadata/conf.py

@@ -18,8 +18,8 @@
 from django.utils.translation import ugettext_lazy as _t
 
 from desktop.conf import AUTH_USERNAME as DEFAULT_AUTH_USERNAME, AUTH_PASSWORD as DEFAULT_AUTH_PASSWORD, \
-                         AUTH_PASSWORD_SCRIPT, coerce_password_from_script, default_ssl_validate
-from desktop.lib.conf import Config, ConfigSection, coerce_bool
+                         AUTH_PASSWORD_SCRIPT, default_ssl_validate
+from desktop.lib.conf import Config, ConfigSection, coerce_bool, coerce_password_from_script
 
 
 def get_auth_username():