Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbf889e6

Browse files
committed
Add new USERLIMIT GUC source level so certain options can be disabled
or increased only by super-users.This fixes problems caused by making certain variables SUSET forsecurity reasons.
1 parent6896bfa commitbf889e6

File tree

4 files changed

+169
-47
lines changed

4 files changed

+169
-47
lines changed

‎doc/src/sgml/runtime.sgml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.190 2003/07/04 16:41:21 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.191 2003/07/09 06:47:34 momjian Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -1541,6 +1541,7 @@ SET ENABLE_SEQSCAN TO OFF;
15411541
to the log. The default is <literal>NOTICE</>. Note that
15421542
<literal>LOG</> has a different rank here than in
15431543
<literal>CLIENT_MIN_MESSAGES</>.
1544+
Only superusers can increase this option.
15441545
</para>
15451546
</listitem>
15461547
</varlistentry>
@@ -1576,6 +1577,7 @@ SET ENABLE_SEQSCAN TO OFF;
15761577
SQL statements causing errors, fatal errors, or panics will be
15771578
logged. Enabling this option can be helpful in tracking down
15781579
the source of any errors that appear in the server log.
1580+
Only superusers can increase this option.
15791581
</para>
15801582
</listitem>
15811583
</varlistentry>
@@ -1593,6 +1595,8 @@ SET ENABLE_SEQSCAN TO OFF;
15931595
than 250ms will be logged. Enabling this
15941596
option can be useful in tracking down unoptimized queries in
15951597
your applications.
1598+
Only superusers can increase this option if it is set to
1599+
non-zero by the administrator.
15961600
</para>
15971601
</listitem>
15981602
</varlistentry>
@@ -1743,6 +1747,8 @@ SET ENABLE_SEQSCAN TO OFF;
17431747
To use this option, enable <varname>LOG_STATEMENT</> and
17441748
<varname>LOG_PID</> so you can link the statement to the
17451749
duration using the process ID.
1750+
Only superusers can turn off this option if it is enabled by
1751+
the administrator.
17461752
</para>
17471753
</listitem>
17481754
</varlistentry>
@@ -1765,6 +1771,8 @@ SET ENABLE_SEQSCAN TO OFF;
17651771
<listitem>
17661772
<para>
17671773
Causes each SQL statement to be logged.
1774+
Only superusers can turn off this option if it is enabled by
1775+
the administrator.
17681776
</para>
17691777
</listitem>
17701778
</varlistentry>
@@ -1826,6 +1834,8 @@ SET ENABLE_SEQSCAN TO OFF;
18261834
For each query, write performance statistics of the respective
18271835
module to the server log. This is a crude profiling
18281836
instrument.
1837+
Only superusers can turn off this option if it is enabled by
1838+
the administrator.
18291839
</para>
18301840
</listitem>
18311841
</varlistentry>

‎src/backend/tcop/postgres.c‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.349 2003/07/04 16:41:21 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.350 2003/07/09 06:47:34 momjian Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -1943,7 +1943,7 @@ PostgresMain(int argc, char *argv[], const char *username)
19431943
boolsecure;
19441944
interrs=0;
19451945
intdebug_flag=0;
1946-
GucContextctx;
1946+
GucContextctx,debug_context;
19471947
GucSourcegucsource;
19481948
char*tmp;
19491949
intfirstchar;
@@ -2018,7 +2018,7 @@ PostgresMain(int argc, char *argv[], const char *username)
20182018

20192019
/* all options are allowed until '-p' */
20202020
secure= true;
2021-
ctx=PGC_POSTMASTER;
2021+
ctx=debug_context=PGC_POSTMASTER;
20222022
gucsource=PGC_S_ARGV;/* initial switches came from command line */
20232023

20242024
while ((flag=getopt(argc,argv,"A:B:c:CD:d:Eef:FiNOPo:p:S:st:v:W:x:-:"))!=-1)
@@ -2055,25 +2055,34 @@ PostgresMain(int argc, char *argv[], const char *username)
20552055

20562056
case'd':/* debug level */
20572057
{
2058-
debug_flag=atoi(optarg);
2059-
/* Set server debugging level. */
2060-
if (atoi(optarg)!=0)
2058+
/*
2059+
*Client option can't decrease debug level.
2060+
*We have to do the test here because we group priv and client
2061+
*set GUC calls below, after we know the final debug value.
2062+
*/
2063+
if (ctx!=PGC_BACKEND||atoi(optarg)>debug_flag)
20612064
{
2062-
char*debugstr=palloc(strlen("debug")+strlen(optarg)+1);
2063-
2064-
sprintf(debugstr,"debug%s",optarg);
2065-
SetConfigOption("log_min_messages",debugstr,ctx,gucsource);
2066-
pfree(debugstr);
2067-
2065+
debug_flag=atoi(optarg);
2066+
debug_context=ctx;/* save context for use below */
2067+
/* Set server debugging level. */
2068+
if (debug_flag!=0)
2069+
{
2070+
char*debugstr=palloc(strlen("debug")+strlen(optarg)+1);
2071+
2072+
sprintf(debugstr,"debug%s",optarg);
2073+
SetConfigOption("log_min_messages",debugstr,ctx,gucsource);
2074+
pfree(debugstr);
2075+
2076+
}
2077+
else
2078+
/*
2079+
* -d0 allows user to prevent postmaster debug
2080+
* from propagating to backend. It would be nice
2081+
* to set it to the postgresql.conf value here.
2082+
*/
2083+
SetConfigOption("log_min_messages","notice",
2084+
ctx,gucsource);
20682085
}
2069-
else
2070-
/*
2071-
* -d0 allows user to prevent postmaster debug
2072-
* from propagating to backend. It would be nice
2073-
* to set it to the postgresql.conf value here.
2074-
*/
2075-
SetConfigOption("log_min_messages","notice",
2076-
ctx,gucsource);
20772086
}
20782087
break;
20792088

@@ -2323,20 +2332,19 @@ PostgresMain(int argc, char *argv[], const char *username)
23232332

23242333

23252334
/*
2326-
* -d is not the same as setting
2327-
* log_min_messages because it enables other
2328-
* output options.
2335+
* -d is not the same as setting log_min_messages because it enables
2336+
* other output options.
23292337
*/
23302338
if (debug_flag >=1)
2331-
SetConfigOption("log_connections","true",ctx,gucsource);
2339+
SetConfigOption("log_connections","true",debug_context,gucsource);
23322340
if (debug_flag >=2)
2333-
SetConfigOption("log_statement","true",ctx,gucsource);
2341+
SetConfigOption("log_statement","true",debug_context,gucsource);
23342342
if (debug_flag >=3)
2335-
SetConfigOption("debug_print_parse","true",ctx,gucsource);
2343+
SetConfigOption("debug_print_parse","true",debug_context,gucsource);
23362344
if (debug_flag >=4)
2337-
SetConfigOption("debug_print_plan","true",ctx,gucsource);
2345+
SetConfigOption("debug_print_plan","true",debug_context,gucsource);
23382346
if (debug_flag >=5)
2339-
SetConfigOption("debug_print_rewritten","true",ctx,gucsource);
2347+
SetConfigOption("debug_print_rewritten","true",debug_context,gucsource);
23402348

23412349
/*
23422350
* Process any additional GUC variable settings passed in startup packet.
@@ -2548,7 +2556,7 @@ PostgresMain(int argc, char *argv[], const char *username)
25482556
if (!IsUnderPostmaster)
25492557
{
25502558
puts("\nPOSTGRES backend interactive interface ");
2551-
puts("$Revision: 1.349 $ $Date: 2003/07/04 16:41:21 $\n");
2559+
puts("$Revision: 1.350 $ $Date: 2003/07/09 06:47:34 $\n");
25522560
}
25532561

25542562
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp