sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-25 00:04:05 -04:00
Code Issues Projects Releases Wiki Activity

Security fix for plperl.

Browse Source
This commit is contained in:
Bruce Momjian 2000-04-18 15:04:02 +00:00
parent 85736153ee
commit fe922de3f7
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pl/plperl/Makefile.PL
View File

@ -51,10 +51,9 @@ my $opcode = '';
} }
my $perllib = "-L$Config{archlibexp}/CORE -lperl"; my $perllib = "-L$Config{archlibexp}/CORE -lperl";
my $dynalib = "$Config{archlibexp}/auto/DynaLoader/DynaLoader.a";
WriteMakefile( 'NAME' => 'plperl', WriteMakefile( 'NAME' => 'plperl',
dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib $dynalib" } , dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } ,
INC => '-I$(SRCDIR)/include -I$(SRCDIR)/backend', INC => '-I$(SRCDIR)/include -I$(SRCDIR)/backend',
XS => { 'SPI.xs' => 'SPI.c' }, XS => { 'SPI.xs' => 'SPI.c' },
OBJECT => 'plperl.o eloglvl.o SPI.o', OBJECT => 'plperl.o eloglvl.o SPI.o',

41
src/pl/plperl/plperl.c
View File

@ -219,7 +219,15 @@ static void
plperl_init_safe_interp(void) plperl_init_safe_interp(void)
{ {
char *embedding[] = {"", "-e", "use DynaLoader; require Safe; SPI::bootstrap()", "0"}; char *embedding[3] = {
"", "-e",
/* no commas between the next 4 please. They are supposed to be one string
*/
"require Safe; SPI::bootstrap();"
"sub ::mksafefunc { my $x = new Safe; $x->permit_only(':default');"
"$x->share(qw[&elog &DEBUG &NOTICE &NOIND &ERROR]);"
" return $x->reval(qq[sub { $_[0] }]); }"
};
plperl_safe_interp = perl_alloc(); plperl_safe_interp = perl_alloc();
if (!plperl_safe_interp) if (!plperl_safe_interp)
@ -302,16 +310,19 @@ plperl_call_handler(FmgrInfo *proinfo,
**********************************************************************/ **********************************************************************/
static static
SV * SV *
plperl_create_sub(SV * s) plperl_create_sub(char * s)
{ {
dSP; dSP;
SV *subref = NULL; SV *subref = NULL;
int count;
ENTER; ENTER;
SAVETMPS; SAVETMPS;
PUSHMARK(SP); PUSHMARK(SP);
perl_eval_sv(s, G_SCALAR | G_EVAL | G_KEEPERR); XPUSHs(sv_2mortal(newSVpv(s,0)));
PUTBACK;
count = perl_call_pv("mksafefunc", G_SCALAR | G_EVAL | G_KEEPERR);
SPAGAIN; SPAGAIN;
if (SvTRUE(GvSV(errgv))) if (SvTRUE(GvSV(errgv)))
@ -323,6 +334,10 @@ plperl_create_sub(SV * s)
elog(ERROR, "creation of function failed : %s", SvPV(GvSV(errgv), na)); elog(ERROR, "creation of function failed : %s", SvPV(GvSV(errgv), na));
} }
if (count != 1) {
elog(ERROR, "creation of function failed - no return from mksafefunc");
}
/* /*
* need to make a deep copy of the return. it comes off the stack as a * need to make a deep copy of the return. it comes off the stack as a
* temporary. * temporary.
@ -357,7 +372,6 @@ plperl_create_sub(SV * s)
* *
**********************************************************************/ **********************************************************************/
extern void boot_DynaLoader _((CV * cv));
extern void boot_Opcode _((CV * cv)); extern void boot_Opcode _((CV * cv));
extern void boot_SPI _((CV * cv)); extern void boot_SPI _((CV * cv));
@ -366,7 +380,6 @@ plperl_init_shared_libs(void)
{ {
char *file = __FILE__; char *file = __FILE__;
newXS("DynaLoader::bootstrap", boot_DynaLoader, file);
newXS("Opcode::bootstrap", boot_Opcode, file); newXS("Opcode::bootstrap", boot_Opcode, file);
newXS("SPI::bootstrap", boot_SPI, file); newXS("SPI::bootstrap", boot_SPI, file);
} }
@ -492,8 +505,6 @@ plperl_func_handler(FmgrInfo *proinfo,
HeapTuple typeTup; HeapTuple typeTup;
Form_pg_proc procStruct; Form_pg_proc procStruct;
Form_pg_type typeStruct; Form_pg_type typeStruct;
SV *proc_internal_def;
char proc_internal_args[4096];
char *proc_source; char *proc_source;
/************************************************************ /************************************************************
@ -550,7 +561,6 @@ plperl_func_handler(FmgrInfo *proinfo,
* of all procedure arguments * of all procedure arguments
************************************************************/ ************************************************************/
prodesc->nargs = proinfo->fn_nargs; prodesc->nargs = proinfo->fn_nargs;
proc_internal_args[0] = '\0';
for (i = 0; i < proinfo->fn_nargs; i++) for (i = 0; i < proinfo->fn_nargs; i++)
{ {
typeTup = SearchSysCacheTuple(TYPEOID, typeTup = SearchSysCacheTuple(TYPEOID,
@ -584,23 +594,12 @@ plperl_func_handler(FmgrInfo *proinfo,
************************************************************/ ************************************************************/
proc_source = textout(&(procStruct->prosrc)); proc_source = textout(&(procStruct->prosrc));
/*
* the string has been split for readbility. please don't put
* commas between them. Hope everyone is ANSI
*/
proc_internal_def = newSVpvf(
"$::x = new Safe;"
"$::x->permit_only(':default');"
"$::x->share(qw[&elog &DEBUG &NOTICE &NOIND &ERROR]);"
"use strict;"
"return $::x->reval( q[ sub { %s } ]);", proc_source);
pfree(proc_source);
/************************************************************ /************************************************************
* Create the procedure in the interpreter * Create the procedure in the interpreter
************************************************************/ ************************************************************/
prodesc->reference = plperl_create_sub(proc_internal_def); prodesc->reference = plperl_create_sub(proc_source);
pfree(proc_source);
if (!prodesc->reference) if (!prodesc->reference)
{ {
free(prodesc->proname); free(prodesc->proname);