Fix top level authentication.

[pithos] / tools / lib / util.py

diff --git a/tools/lib/util.py b/tools/lib/util.py
index 7ad78f4..5e78e60 100644 (file)
--- a/tools/lib/util.py
+++ b/tools/lib/util.py
@@ -1,16 +1,22 @@
 import os
 
-#DEFAULT_HOST = 'pithos.dev.grnet.gr'
-DEFAULT_HOST = '127.0.0.1:8000'
+DEFAULT_HOST = 'pithos.dev.grnet.gr'
+#DEFAULT_HOST = '127.0.0.1:8000'
 DEFAULT_API = 'v1'
 DEFAULT_USER = 'test'
 DEFAULT_AUTH = '0000'
 
 def get_user():
-    return DEFAULT_USER
+    try:
+        return os.environ['PITHOS_USER']
+    except KeyError:
+        return DEFAULT_USER
 
 def get_auth():
-    return DEFAULT_AUTH
+    try:
+        return os.environ['PITHOS_AUTH']
+    except KeyError:
+        return DEFAULT_AUTH
 
 def get_server():
     try:
@@ -22,4 +28,4 @@ def get_api():
     try:
         return os.environ['PITHOS_API']
     except KeyError:
-        return DEFAULT_API
\ No newline at end of file
+        return DEFAULT_API