You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/12/12 21:14:50 UTC
svn commit: r1773875 - in /uima/uima-ducc/trunk: src/main/admin/
uima-ducc-database/src/main/java/org/apache/uima/ducc/database/
Author: degenaro
Date: Mon Dec 12 21:14:50 2016
New Revision: 1773875
URL: http://svn.apache.org/viewvc?rev=1773875&view=rev
Log:
UIMA-5212 DUCC Database (db) user "guest" with r/o access should employ private pw
Modified:
uima/uima-ducc/trunk/src/main/admin/ducc_post_install
uima/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/uima-ducc/trunk/src/main/admin/rm_qoccupancy
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java
uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_post_install
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_post_install?rev=1773875&r1=1773874&r2=1773875&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_post_install (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_post_install Mon Dec 12 21:14:50 2016
@@ -156,6 +156,9 @@ class PostInstall():
self.ducc_private_properties.delete('db_password')
self.ducc_private_properties.put('db_password', db_pw, ['#Db password, default is randomly generated']);
+ self.ducc_private_properties.delete('db_password_guest')
+ self.ducc_private_properties.put('db_password_guest', db_pw, ['#Db password for guest, default is same value as db_password']);
+
return True
else:
return False
Modified: uima/uima-ducc/trunk/src/main/admin/ducc_util.py
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1773875&r1=1773874&r2=1773875&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/uima-ducc/trunk/src/main/admin/ducc_util.py Mon Dec 12 21:14:50 2016
@@ -185,6 +185,10 @@ class DuccUtil(DuccBase):
print "bypassing database because no password is set."
self.db_bypass = True
+ self.db_password_guest = dbprops.get('db_password_guest')
+ if ( self.db_password_guest == None ):
+ self.db_password_guest = 'guest'
+
# does the database process exist?
def db_process_alive(self):
pidfile = self.DUCC_HOME + '/state/cassandra.pid'
Modified: uima/uima-ducc/trunk/src/main/admin/rm_qoccupancy
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/admin/rm_qoccupancy?rev=1773875&r1=1773874&r2=1773875&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/admin/rm_qoccupancy (original)
+++ uima/uima-ducc/trunk/src/main/admin/rm_qoccupancy Mon Dec 12 21:14:50 2016
@@ -122,8 +122,10 @@ class DuccRmQOccupancy(DuccUtil):
DH = self.DUCC_HOME
dbn = self.ducc_properties.get('ducc.database.host')
+ guest_pw = self.db_password_guest
+
os.environ['TERM'] = 'dumb' # insure no colors. --no-color isn't inhibiting colors in this shell for some reason.
- CMD = [DH + '/cassandra-server/bin/cqlsh', dbn, '-u', 'guest', '-p', 'guest', '-e', '"select * from ducc.rmnodes; select * from ducc.rmshares;"']
+ CMD = [DH + '/cassandra-server/bin/cqlsh', dbn, '-u', 'guest', '-p', guest_pw, '-e', '"select * from ducc.rmnodes; select * from ducc.rmshares;"']
CMD = ' '.join(CMD)
lines = []
Modified: uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java?rev=1773875&r1=1773874&r2=1773875&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java Mon Dec 12 21:14:50 2016
@@ -198,9 +198,11 @@ public class DbCreate
{
String methodName = "createSchema";
+ String guest_pw = adminpw;
+
// A 'keyspace' is what we usually think of as a database.
session.execute("CREATE KEYSPACE IF NOT EXISTS ducc WITH replication = {'class':'SimpleStrategy', 'replication_factor':1};");
- session.execute("CREATE USER IF NOT EXISTS guest WITH PASSWORD 'guest' NOSUPERUSER");
+ session.execute("CREATE USER IF NOT EXISTS guest WITH PASSWORD '"+guest_pw+"' NOSUPERUSER");
session.execute("GRANT SELECT ON KEYSPACE ducc TO guest");
session.execute("REVOKE SELECT ON KEYSPACE system FROM guest");
session.execute("REVOKE SELECT ON KEYSPACE system_auth FROM guest");
Modified: uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java?rev=1773875&r1=1773874&r2=1773875&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java Mon Dec 12 21:14:50 2016
@@ -168,15 +168,7 @@ public class DbManager
static void dbPassword()
throws Exception
{
- // If I can not read the superuser password I'll allow login as guest. If guest has been revokded
- // that will be discovered later when I actually sign in.
File f = new File(System.getProperty("DUCC_HOME") + "/resources.private/" + DbCreate.PASSWORD_FILE);
- if ( ! f.canRead() ) {
- db_id = "guest";
- db_pw = "guest";
- return;
- }
-
// If i can read the file that's supposed to have the super user password I'll do so. If not, or
// if there's no password there, tough luck Charlie.
db_id = "ducc";