Changeset: 4eab9935b32f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4eab9935b32f
Branch: default
Log Message:
Merge userprofile into default.
diffs (truncated from 7796 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -33309,11 +33309,6 @@ pattern batsql.ntile(X_0:bat[:any], X_1:
SQLntile;
return the groups divided as equally as possible
batsql
-password
-pattern batsql.password(X_0:bat[:str]):bat[:str]
-db_password_wrap;
-Return password hash of user
-batsql
percent_rank
pattern batsql.percent_rank(X_0:bat[:any_1], X_1:any_2, X_2:any_3):bat[:dbl]
SQLpercent_rank;
@@ -43789,26 +43784,11 @@ pattern capi.subeval_aggr(X_0:ptr, X_1:b
CUDFevalAggr;
grouped aggregates through CUDF
clients
-addUser
-unsafe pattern clients.addUser(X_0:str, X_1:str):oid
-CLTaddUser;
-Allow user with password access to the given scenarios
-clients
backendsum
command clients.backendsum(X_0:str):str
CLTbackendsum;
Return hex string representation of the currently used hash of the given string
clients
-changePassword
-unsafe pattern clients.changePassword(X_0:str, X_1:str):void
-CLTchangePassword;
-Change the password for the current user
-clients
-changeUsername
-unsafe pattern clients.changeUsername(X_0:str, X_1:str):void
-CLTchangeUsername;
-Change the username of the user into the new string
-clients
checkPermission
pattern clients.checkPermission(X_0:str, X_1:str):void
CLTcheckPermission;
@@ -43849,11 +43829,6 @@ pattern clients.getUsername():str
CLTgetUsername;
Return the username of the currently logged in user
clients
-getUsers
-pattern clients.getUsers() (X_0:bat[:oid], X_1:bat[:str])
-CLTgetUsers;
-return a BAT with user id and one with name available in the system
-clients
getprofile
pattern clients.getprofile() (X_0:str, X_1:int, X_2:int, X_3:int, X_4:int)
CLTgetProfile;
@@ -43874,11 +43849,6 @@ unsafe pattern clients.quit(X_0:int):voi
CLTquit;
Terminate the session for a single client using a soft error.@It is the
privilege of the console user.
clients
-removeUser
-unsafe pattern clients.removeUser(X_0:str):void
-CLTremoveUser;
-Remove the given user from the system
-clients
ripemd160sum
command clients.ripemd160sum(X_0:str):str
CLTripemd160sum;
@@ -43889,11 +43859,6 @@ unsafe pattern clients.setListing(X_0:in
CLTsetListing;
Turn on/off echo of MAL instructions:@1 - echo input,@2 - show mal
instruction,@4 - show details of type resolutoin, @8 - show binding information.
clients
-setPassword
-unsafe pattern clients.setPassword(X_0:str, X_1:str):void
-CLTsetPassword;
-Set the password for the given user
-clients
setQryTimeoutMicro
unsafe pattern clients.setQryTimeoutMicro(X_0:lng):void
CLTqueryTimeoutMicro;
@@ -48434,11 +48399,6 @@ command sql.date_trunc(X_0:str, X_1:time
date_trunc;
Truncate a timestamp to (millennium,
century,decade,year,quarter,month,week,day,hour,minute,second,
milliseconds,microseconds)
sql
-db_users
-pattern sql.db_users():bat[:str]
-db_users_wrap;
-return table of users with sql scenario
-sql
delete
unsafe pattern sql.delete(X_0:int, X_1:str, X_2:str, X_3:any):int
mvc_delete_wrap;
@@ -48751,7 +48711,7 @@ getPipeCatalog;
sql
password
pattern sql.password(X_0:str):str
-db_password_wrap;
+SQLuser_password;
Return password hash of user
sql
percent_rank
@@ -49425,7 +49385,7 @@ SQLalter_table;
Catalog operation alter_table
sqlcatalog
alter_user
-pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str):void
+pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str):void
SQLalter_user;
Catalog operation alter_user
sqlcatalog
@@ -49470,7 +49430,7 @@ SQLcreate_type;
Catalog operation create_type
sqlcatalog
create_user
-pattern sqlcatalog.create_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str):void
+pattern sqlcatalog.create_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:lng, X_7:int, X_8:str, X_9:str):void
SQLcreate_user;
Catalog operation create_user
sqlcatalog
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -24449,11 +24449,6 @@ pattern batsql.ntile(X_0:bat[:any], X_1:
SQLntile;
return the groups divided as equally as possible
batsql
-password
-pattern batsql.password(X_0:bat[:str]):bat[:str]
-db_password_wrap;
-Return password hash of user
-batsql
percent_rank
pattern batsql.percent_rank(X_0:bat[:any_1], X_1:any_2, X_2:any_3):bat[:dbl]
SQLpercent_rank;
@@ -32284,26 +32279,11 @@ pattern capi.subeval_aggr(X_0:ptr, X_1:b
CUDFevalAggr;
grouped aggregates through CUDF
clients
-addUser
-unsafe pattern clients.addUser(X_0:str, X_1:str):oid
-CLTaddUser;
-Allow user with password access to the given scenarios
-clients
backendsum
command clients.backendsum(X_0:str):str
CLTbackendsum;
Return hex string representation of the currently used hash of the given string
clients
-changePassword
-unsafe pattern clients.changePassword(X_0:str, X_1:str):void
-CLTchangePassword;
-Change the password for the current user
-clients
-changeUsername
-unsafe pattern clients.changeUsername(X_0:str, X_1:str):void
-CLTchangeUsername;
-Change the username of the user into the new string
-clients
checkPermission
pattern clients.checkPermission(X_0:str, X_1:str):void
CLTcheckPermission;
@@ -32344,11 +32324,6 @@ pattern clients.getUsername():str
CLTgetUsername;
Return the username of the currently logged in user
clients
-getUsers
-pattern clients.getUsers() (X_0:bat[:oid], X_1:bat[:str])
-CLTgetUsers;
-return a BAT with user id and one with name available in the system
-clients
getprofile
pattern clients.getprofile() (X_0:str, X_1:int, X_2:int, X_3:int, X_4:int)
CLTgetProfile;
@@ -32369,11 +32344,6 @@ unsafe pattern clients.quit(X_0:int):voi
CLTquit;
Terminate the session for a single client using a soft error.@It is the
privilege of the console user.
clients
-removeUser
-unsafe pattern clients.removeUser(X_0:str):void
-CLTremoveUser;
-Remove the given user from the system
-clients
ripemd160sum
command clients.ripemd160sum(X_0:str):str
CLTripemd160sum;
@@ -32384,11 +32354,6 @@ unsafe pattern clients.setListing(X_0:in
CLTsetListing;
Turn on/off echo of MAL instructions:@1 - echo input,@2 - show mal
instruction,@4 - show details of type resolutoin, @8 - show binding information.
clients
-setPassword
-unsafe pattern clients.setPassword(X_0:str, X_1:str):void
-CLTsetPassword;
-Set the password for the given user
-clients
setQryTimeoutMicro
unsafe pattern clients.setQryTimeoutMicro(X_0:lng):void
CLTqueryTimeoutMicro;
@@ -36834,11 +36799,6 @@ command sql.date_trunc(X_0:str, X_1:time
date_trunc;
Truncate a timestamp to (millennium,
century,decade,year,quarter,month,week,day,hour,minute,second,
milliseconds,microseconds)
sql
-db_users
-pattern sql.db_users():bat[:str]
-db_users_wrap;
-return table of users with sql scenario
-sql
delete
unsafe pattern sql.delete(X_0:int, X_1:str, X_2:str, X_3:any):int
mvc_delete_wrap;
@@ -37151,7 +37111,7 @@ getPipeCatalog;
sql
password
pattern sql.password(X_0:str):str
-db_password_wrap;
+SQLuser_password;
Return password hash of user
sql
percent_rank
@@ -37745,7 +37705,7 @@ SQLalter_table;
Catalog operation alter_table
sqlcatalog
alter_user
-pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str):void
+pattern sqlcatalog.alter_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:str):void
SQLalter_user;
Catalog operation alter_user
sqlcatalog
@@ -37790,7 +37750,7 @@ SQLcreate_type;
Catalog operation create_type
sqlcatalog
create_user
-pattern sqlcatalog.create_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str):void
+pattern sqlcatalog.create_user(X_0:str, X_1:str, X_2:int, X_3:str, X_4:str,
X_5:str, X_6:lng, X_7:int, X_8:str, X_9:str):void
SQLcreate_user;
Catalog operation create_user
sqlcatalog
diff --git a/clients/Tests/exports.py b/clients/Tests/exports.py
--- a/clients/Tests/exports.py
+++ b/clients/Tests/exports.py
@@ -5,3 +5,4 @@ output = MonetDBtesting.listexports.list
stable = open('exports.stable.out').readlines()
for line in difflib.unified_diff(stable, output):
sys.stderr.write(line)
+
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -725,21 +725,22 @@ int mo_system_config(opt **Set, int setl
const char *wsaerror(int);
# monetdb5
+str AUTHGeneratePasswordHash(str *res, const char *value);
+str AUTHRegisterGetPasswordHandler(get_user_password_handler callback);
+str AUTHRegisterGetUserNameHandler(get_user_name_handler callback);
+str AUTHRegisterGetUserOIDHandler(get_user_oid_handler callback);
str AUTHaddRemoteTableCredentials(const char *local_table, const char
*localuser, const char *uri, const char *remoteuser, const char *pass, bool
pw_encrypted);
-str AUTHaddUser(oid *ret, Client c, const char *user, const char *pass);
-str AUTHchangePassword(Client c, const char *oldpass, const char *passwd);
-str AUTHchangeUsername(Client c, const char *olduser, const char *newuser);
str AUTHcheckCredentials(oid *ret, Client c, const char *user, const char
*passwd, const char *challenge, const char *algo);
+str AUTHcypherValue(str *ret, const char *value);
+str AUTHdecypherValue(str *ret, const char *value);
str AUTHdeleteRemoteTableCredentials(const char *local_table);
str AUTHgetPasswordHash(str *ret, Client c, const char *username);
str AUTHgetRemoteTableCredentials(const char *local_table, str *uri, str
*username, str *password);
str AUTHgetUsername(str *ret, Client c);
-str AUTHgetUsers(BAT **ret1, BAT **ret2, Client c);
str AUTHinitTables(const char *passwd);
-str AUTHremoveUser(Client c, const char *username);
-str AUTHresolveUser(str *ret, oid uid);
-str AUTHsetPassword(Client c, const char *username, const char *passwd);
+str AUTHrequireAdmin(Client c);
str AUTHunlockVault(const char *password);
+str AUTHverifyPassword(const char *passwd);
str BATinfo(BAT **key, BAT **val, const bat bid);
str BKCmirror(bat *ret, const bat *bid);
str BKCnewBAT(bat *res, const int *tt, const BUN *cap, role_t role);
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -170,7 +170,6 @@ tst802
tst804
tst810
tst819
-tst830
tst840
tst850
tst866
diff --git a/monetdb5/mal/Tests/tst830.maltest
b/monetdb5/mal/Tests/tst830.maltest
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst830.maltest
+++ /dev/null
@@ -1,61 +0,0 @@
-statement ok
-function foo();
- pw := clients.backendsum("Pmonetdb");
- id := clients.addUser("monetdb", pw);
-catch MALException:str;
- io.printf("0: %s\n",MALException);
-exit MALException;
- # should print 1@0 or something
- id := clients.addUser("test", pw);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
