Changeset: 8921dbd8f01f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8921dbd8f01f
Modified Files:
        sql/backends/monet5/sql_upgrades.c
        sql/scripts/25_debug.sql
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.32bit
        sql/test/emptydb/Tests/check.stable.out.int128
Branch: default
Log Message:

Reverting changeset 54e2f2eb446f. When the server receives the SIGTERM signal, 
it waits for all clients to finish, so an user could use the sleep function for 
a denial of service


diffs (64 lines):

diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2500,10 +2500,8 @@ sql_update_default(Client c, mvc *sql, c
                        " external name mdb.\"getDebugFlags\";\n"
                        "create procedure sys.\"sleep\"(msecs int)\n"
                        " external name \"alarm\".\"sleep\";\n"
-                       "grant execute on procedure sys.\"sleep\"(int) to 
public;\n"
                        "create function sys.\"sleep\"(msecs int) returns 
integer\n"
-                       " external name \"alarm\".\"sleep\";\n"
-                       "grant execute on function sys.\"sleep\"(int) to 
public;\n");
+                       " external name \"alarm\".\"sleep\";\n");
        pos += snprintf(buf + pos, bufsize - pos,
                        "update sys.functions set system = true where schema_id 
= (select id from sys.schemas where name = 'sys')"
                        " and name in ('debug', 'debugflags', 'sleep');\n");
diff --git a/sql/scripts/25_debug.sql b/sql/scripts/25_debug.sql
--- a/sql/scripts/25_debug.sql
+++ b/sql/scripts/25_debug.sql
@@ -85,9 +85,7 @@ create function sys.deltas ("schema" str
 -- Sleep procedure
 create procedure sys."sleep"(msecs int)
        external name "alarm"."sleep";
-grant execute on procedure sys."sleep"(int) to public;
 
 -- Sleep function
 create function sys."sleep"(msecs int) returns integer
        external name "alarm"."sleep";
-grant execute on function sys."sleep"(int) to public;
diff --git a/sql/test/emptydb/Tests/check.stable.out 
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -5067,8 +5067,6 @@ drop function pcre_replace(string, strin
 [ "seq_char",  "public",       "EXECUTE",      "monetdb",      0       ]
 [ "seq_length",        "public",       "EXECUTE",      "monetdb",      0       
]
 [ "setmasklen",        "public",       "EXECUTE",      "monetdb",      0       
]
-[ "sleep",     "public",       "EXECUTE",      "monetdb",      0       ]
-[ "sleep",     "public",       "EXECUTE",      "monetdb",      0       ]
 [ "st_area",   "public",       "EXECUTE",      "monetdb",      0       ]
 [ "st_asbinary",       "public",       "EXECUTE",      "monetdb",      0       
]
 [ "st_asewkt", "public",       "EXECUTE",      "monetdb",      0       ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit 
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -5050,8 +5050,6 @@ drop function pcre_replace(string, strin
 [ "seq_char",  "public",       "EXECUTE",      "monetdb",      0       ]
 [ "seq_length",        "public",       "EXECUTE",      "monetdb",      0       
]
 [ "setmasklen",        "public",       "EXECUTE",      "monetdb",      0       
]
-[ "sleep",     "public",       "EXECUTE",      "monetdb",      0       ]
-[ "sleep",     "public",       "EXECUTE",      "monetdb",      0       ]
 [ "st_area",   "public",       "EXECUTE",      "monetdb",      0       ]
 [ "st_asbinary",       "public",       "EXECUTE",      "monetdb",      0       
]
 [ "st_asewkt", "public",       "EXECUTE",      "monetdb",      0       ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128 
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -5293,8 +5293,6 @@ drop function pcre_replace(string, strin
 [ "seq_char",  "public",       "EXECUTE",      "monetdb",      0       ]
 [ "seq_length",        "public",       "EXECUTE",      "monetdb",      0       
]
 [ "setmasklen",        "public",       "EXECUTE",      "monetdb",      0       
]
-[ "sleep",     "public",       "EXECUTE",      "monetdb",      0       ]
-[ "sleep",     "public",       "EXECUTE",      "monetdb",      0       ]
 [ "st_area",   "public",       "EXECUTE",      "monetdb",      0       ]
 [ "st_asbinary",       "public",       "EXECUTE",      "monetdb",      0       
]
 [ "st_asewkt", "public",       "EXECUTE",      "monetdb",      0       ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to