From: MauMau <maumau307@gmail.com>
To: Michael Paquier <michael.paquier@gmail.com>
To: Breen Hagan <breen@rtda.com>
Cc: Heikki Linnakangas <hlinnaka@iki.fi>
Cc: Alvaro Herrera <alvherre@2ndquadrant.com>
Cc: PostgreSQL Hackers <pgsql-hackers@postgresql.org>
Subject: Re: BUG #13755: pgwin32_is_service not checking if SECURITY_SERVICE_SID is disabled
Date: Sun, 6 Nov 2016 18:30:41 +0900
Message-ID: <952A88FFCBDA419EB6D6556B6A8F29C1@tunaPC> (raw)
In-Reply-To: <CAB7nPqTMMFdzG5kcCjeC98rVJA+sKquowWDOu1=6w=OAkzRiSg@mail.gmail.com>
References: <CAB7nPqTAiB6+z=Cbqzt4KNNkynhP6D7_r_KaZBkmpt9mX7STuQ@mail.gmail.com>
<20160404160801.GA186687@alvherre.pgsql>
<CAB7nPqQjdCfny+SeF8mVehP+e1m4EwYxLBC2rhNHPwk5aTisPw@mail.gmail.com>
<CAB7nPqSvfu=KpJ=NX+YAHmgAmQdzA7N5h31BjzXeMgczhGCC+Q@mail.gmail.com>
<64a0ee81-2e30-c9b1-97b6-312772f89a2e@iki.fi>
<CAC6pFPwwwufOHocFEbZimnd6-Mh3A2xYA=F9HmC_kxV1NTXhoA@mail.gmail.com>
<CAB7nPqRzb4Fb9bJOttXHjh38hFxaN79hTNJEV0aBbgz=K52ASw@mail.gmail.com>
<CAB7nPqTMMFdzG5kcCjeC98rVJA+sKquowWDOu1=6w=OAkzRiSg@mail.gmail.com>
List-Unsubscribe: <mailto:majordomo@postgresql.org?body=unsub%20pgsql-hackers>
Hello,
Sorry, I may have had to send this to pgsql-hackers. I just replied
to all, which did not include pgsql-hackers but pgsql-bugs because
this discussion was on pgsql-bugs. CommitFest app doesn't seem to
reflect the mails on pgsql-bugs, so I'm re-submitting this here on
pgsql-hackers.
From: Michael Paquier
(Moved to next CF, with same status "Ready for committer").
I reviewed and tested this patch after simplifying it like the
attached one. The file could be reduced by about 110 lines. Please
review and/or test it. Though I kept the status "ready for
committer", feel free to change it back based on the result.
I tested as follows. First, I confirmed that pg_is_admin() still
works by running postgres.exe from the Administrator command line:
--------------------------------------------------
G:\>postgres
Execution of PostgreSQL by a user with administrative permissions is
not
permitted.
The server must be started under an unprivileged user ID to prevent
possible system security compromises. See the documentation for
more information on how to properly start the server.
G:\>
--------------------------------------------------
Then, I added the following two elog() calls in postmaster.c so that
pg_is_admin() and pg_is_service() works fine.
--------------------------------------------------
maybe_start_bgworker();
elog(LOG, "pgwin32_is_admin = %d", pgwin32_is_admin());
elog(LOG, "pgwin32_is_service = %d", pgwin32_is_service());
status = ServerLoop();
--------------------------------------------------
To reproduce the OP's problem, I modified pg_ctl.c to disable
SECURITY_SERVICE_RID when spawning postgres.exe. Without the patch,
starting the Windows service emit the following log, showing that
pg_is_service() misjudged that postgres is running as a Windows
service:
LOG: pgwin32_is_admin = 0
LOG: pgwin32_is_service = 1
With the patch, the log became correct:
LOG: pgwin32_is_admin = 0
LOG: pgwin32_is_service = 0
Regards
Takayuki Tsunakawa
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackersAttachments:win32-security_service-v3.patch (application/octet-stream, 12.7K) download
ÿþd i f f - - g i t a / s r c / p o r t / w i n 3 2 s e c u r i t y . c b / s r c / p o r t / w i n 3 2 s e c u r i t y . c
i n d e x 2 c 9 c a 1 5 . . 3 b 2 2 f 1 6 1 0 0 6 4 4
- - - a / s r c / p o r t / w i n 3 2 s e c u r i t y . c
+ + + b / s r c / p o r t / w i n 3 2 s e c u r i t y . c
@ @ - 1 8 , 1 1 + 1 8 , 6 @ @
# e n d i f
- s t a t i c B O O L p g w i n 3 2 _ g e t _ d y n a m i c _ t o k e n i n f o ( H A N D L E t o k e n ,
- T O K E N _ I N F O R M A T I O N _ C L A S S c l a s s ,
- c h a r * * I n f o B u f f e r , c h a r * e r r b u f , i n t e r r s i z e ) ;
-
-
/ *
* U t i l i t y w r a p p e r f o r f r o n t e n d a n d b a c k e n d w h e n r e p o r t i n g a n e r r o r
* m e s s a g e .
@ @ - 5 3 , 3 3 + 4 8 , 1 1 @ @ l o g _ e r r o r ( c o n s t c h a r * f m t , . . . )
i n t
p g w i n 3 2 _ i s _ a d m i n ( v o i d )
{
- H A N D L E A c c e s s T o k e n ;
- c h a r * I n f o B u f f e r = N U L L ;
- c h a r e r r b u f [ 2 5 6 ] ;
- P T O K E N _ G R O U P S G r o u p s ;
P S I D A d m i n i s t r a t o r s S i d ;
P S I D P o w e r U s e r s S i d ;
S I D _ I D E N T I F I E R _ A U T H O R I T Y N t A u t h o r i t y = { S E C U R I T Y _ N T _ A U T H O R I T Y } ;
- U I N T x ;
- B O O L s u c c e s s ;
-
- i f ( ! O p e n P r o c e s s T o k e n ( G e t C u r r e n t P r o c e s s ( ) , T O K E N _ R E A D , & A c c e s s T o k e n ) )
- {
- l o g _ e r r o r ( _ ( " c o u l d n o t o p e n p r o c e s s t o k e n : e r r o r c o d e % l u \ n " ) ,
- G e t L a s t E r r o r ( ) ) ;
- e x i t ( 1 ) ;
- }
-
- i f ( ! p g w i n 3 2 _ g e t _ d y n a m i c _ t o k e n i n f o ( A c c e s s T o k e n , T o k e n G r o u p s ,
- & I n f o B u f f e r , e r r b u f , s i z e o f ( e r r b u f ) ) )
- {
- l o g _ e r r o r ( " % s " , e r r b u f ) ;
- e x i t ( 1 ) ;
- }
-
- G r o u p s = ( P T O K E N _ G R O U P S ) I n f o B u f f e r ;
-
- C l o s e H a n d l e ( A c c e s s T o k e n ) ;
+ B O O L I s A d m i n i s t r a t o r s ;
+ B O O L I s P o w e r U s e r s ;
i f ( ! A l l o c a t e A n d I n i t i a l i z e S i d ( & N t A u t h o r i t y , 2 ,
S E C U R I T Y _ B U I L T I N _ D O M A I N _ R I D ,
@ @ - 1 0 1 , 2 4 + 7 4 , 2 1 @ @ p g w i n 3 2 _ i s _ a d m i n ( v o i d )
e x i t ( 1 ) ;
}
- s u c c e s s = F A L S E ;
-
- f o r ( x = 0 ; x < G r o u p s - > G r o u p C o u n t ; x + + )
+ i f ( ! C h e c k T o k e n M e m b e r s h i p ( N U L L , A d m i n i s t r a t o r s S i d , & I s A d m i n i s t r a t o r s ) | |
+ ! C h e c k T o k e n M e m b e r s h i p ( N U L L , P o w e r U s e r s S i d , & I s P o w e r U s e r s ) )
{
- i f ( ( E q u a l S i d ( A d m i n i s t r a t o r s S i d , G r o u p s - > G r o u p s [ x ] . S i d ) & &
- ( G r o u p s - > G r o u p s [ x ] . A t t r i b u t e s & S E _ G R O U P _ E N A B L E D ) ) | |
- ( E q u a l S i d ( P o w e r U s e r s S i d , G r o u p s - > G r o u p s [ x ] . S i d ) & &
- ( G r o u p s - > G r o u p s [ x ] . A t t r i b u t e s & S E _ G R O U P _ E N A B L E D ) ) )
- {
- s u c c e s s = T R U E ;
- b r e a k ;
- }
+ l o g _ e r r o r ( " c o u l d n o t c h e c k a c c e s s t o k e n m e m b e r s h i p : e r r o r c o d e % l u \ n " ,
+ G e t L a s t E r r o r ( ) ) ;
+ e x i t ( 1 ) ;
}
- f r e e ( I n f o B u f f e r ) ;
F r e e S i d ( A d m i n i s t r a t o r s S i d ) ;
F r e e S i d ( P o w e r U s e r s S i d ) ;
- r e t u r n s u c c e s s ;
+
+ i f ( I s A d m i n i s t r a t o r s | | I s P o w e r U s e r s )
+ r e t u r n 1 ;
+ e l s e
+ r e t u r n 0 ;
}
/ *
@ @ - 1 4 3 , 1 4 0 + 1 1 3 , 6 3 @ @ i n t
p g w i n 3 2 _ i s _ s e r v i c e ( v o i d )
{
s t a t i c i n t _ i s _ s e r v i c e = - 1 ;
- H A N D L E A c c e s s T o k e n ;
- c h a r * I n f o B u f f e r = N U L L ;
- c h a r e r r b u f [ 2 5 6 ] ;
- P T O K E N _ G R O U P S G r o u p s ;
- P T O K E N _ U S E R U s e r ;
+ B O O L I s M e m b e r ;
P S I D S e r v i c e S i d ;
P S I D L o c a l S y s t e m S i d ;
S I D _ I D E N T I F I E R _ A U T H O R I T Y N t A u t h o r i t y = { S E C U R I T Y _ N T _ A U T H O R I T Y } ;
- U I N T x ;
/ * O n l y c h e c k t h e f i r s t t i m e * /
i f ( _ i s _ s e r v i c e ! = - 1 )
r e t u r n _ i s _ s e r v i c e ;
- i f ( ! O p e n P r o c e s s T o k e n ( G e t C u r r e n t P r o c e s s ( ) , T O K E N _ R E A D , & A c c e s s T o k e n ) )
- {
- f p r i n t f ( s t d e r r , " c o u l d n o t o p e n p r o c e s s t o k e n : e r r o r c o d e % l u \ n " ,
- G e t L a s t E r r o r ( ) ) ;
- r e t u r n - 1 ;
- }
-
- / * F i r s t c h e c k f o r l o c a l s y s t e m * /
- i f ( ! p g w i n 3 2 _ g e t _ d y n a m i c _ t o k e n i n f o ( A c c e s s T o k e n , T o k e n U s e r , & I n f o B u f f e r ,
- e r r b u f , s i z e o f ( e r r b u f ) ) )
- {
- f p r i n t f ( s t d e r r , " % s " , e r r b u f ) ;
- r e t u r n - 1 ;
- }
-
- U s e r = ( P T O K E N _ U S E R ) I n f o B u f f e r ;
-
+ / * F i r s t c h e c k f o r L o c a l S y s t e m * /
i f ( ! A l l o c a t e A n d I n i t i a l i z e S i d ( & N t A u t h o r i t y , 1 ,
S E C U R I T Y _ L O C A L _ S Y S T E M _ R I D , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
& L o c a l S y s t e m S i d ) )
{
- f p r i n t f ( s t d e r r , " c o u l d n o t g e t S I D f o r l o c a l s y s t e m a c c o u n t \ n " ) ;
- C l o s e H a n d l e ( A c c e s s T o k e n ) ;
+ f p r i n t f ( s t d e r r , " c o u l d n o t g e t S I D f o r L o c a l S y s t e m a c c o u n t : e r r o r c o d e % l u \ n " ,
+ G e t L a s t E r r o r ( ) ) ;
r e t u r n - 1 ;
}
- i f ( E q u a l S i d ( L o c a l S y s t e m S i d , U s e r - > U s e r . S i d ) )
+ i f ( ! C h e c k T o k e n M e m b e r s h i p ( N U L L , L o c a l S y s t e m S i d , & I s M e m b e r ) )
{
+ f p r i n t f ( s t d e r r , " c o u l d n o t c h e c k a c c e s s t o k e n m e m b e r s h i p : e r r o r c o d e % l u \ n " ,
+ G e t L a s t E r r o r ( ) ) ;
F r e e S i d ( L o c a l S y s t e m S i d ) ;
- f r e e ( I n f o B u f f e r ) ;
- C l o s e H a n d l e ( A c c e s s T o k e n ) ;
- _ i s _ s e r v i c e = 1 ;
- r e t u r n _ i s _ s e r v i c e ;
+ r e t u r n - 1 ;
}
-
F r e e S i d ( L o c a l S y s t e m S i d ) ;
- f r e e ( I n f o B u f f e r ) ;
- / * N o w c h e c k f o r g r o u p S I D * /
- i f ( ! p g w i n 3 2 _ g e t _ d y n a m i c _ t o k e n i n f o ( A c c e s s T o k e n , T o k e n G r o u p s , & I n f o B u f f e r ,
- e r r b u f , s i z e o f ( e r r b u f ) ) )
+ i f ( I s M e m b e r )
{
- f p r i n t f ( s t d e r r , " % s " , e r r b u f ) ;
- r e t u r n - 1 ;
+ _ i s _ s e r v i c e = 1 ;
+ r e t u r n _ i s _ s e r v i c e ;
}
- G r o u p s = ( P T O K E N _ G R O U P S ) I n f o B u f f e r ;
-
+ / * N e x t c h e c k f o r s e r v i c e g r o u p * /
i f ( ! A l l o c a t e A n d I n i t i a l i z e S i d ( & N t A u t h o r i t y , 1 ,
S E C U R I T Y _ S E R V I C E _ R I D , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
& S e r v i c e S i d ) )
{
- f p r i n t f ( s t d e r r , " c o u l d n o t g e t S I D f o r s e r v i c e g r o u p \ n " ) ;
- f r e e ( I n f o B u f f e r ) ;
- C l o s e H a n d l e ( A c c e s s T o k e n ) ;
+ f p r i n t f ( s t d e r r , " c o u l d n o t g e t S I D f o r s e r v i c e g r o u p : e r r o r c o d e % l u \ n " ,
+ G e t L a s t E r r o r ( ) ) ;
r e t u r n - 1 ;
}
- _ i s _ s e r v i c e = 0 ;
- f o r ( x = 0 ; x < G r o u p s - > G r o u p C o u n t ; x + + )
+ i f ( ! C h e c k T o k e n M e m b e r s h i p ( N U L L , S e r v i c e S i d , & I s M e m b e r ) )
{
- i f ( E q u a l S i d ( S e r v i c e S i d , G r o u p s - > G r o u p s [ x ] . S i d ) )
- {
- _ i s _ s e r v i c e = 1 ;
- b r e a k ;
- }
+ f p r i n t f ( s t d e r r , " c o u l d n o t c h e c k a c c e s s t o k e n m e m b e r s h i p : e r r o r c o d e % l u \ n " ,
+ G e t L a s t E r r o r ( ) ) ;
+ F r e e S i d ( S e r v i c e S i d ) ;
+ r e t u r n - 1 ;
}
-
- f r e e ( I n f o B u f f e r ) ;
F r e e S i d ( S e r v i c e S i d ) ;
- C l o s e H a n d l e ( A c c e s s T o k e n ) ;
+ i f ( I s M e m b e r )
+ _ i s _ s e r v i c e = 1 ;
+ e l s e
+ _ i s _ s e r v i c e = 0 ;
r e t u r n _ i s _ s e r v i c e ;
}
-
-
- / *
- * C a l l G e t T o k e n I n f o r m a t i o n ( ) o n a t o k e n a n d r e t u r n a d y n a m i c a l l y s i z e d
- * b u f f e r w i t h t h e i n f o r m a t i o n i n i t . T h i s b u f f e r m u s t b e f r e e ( ) : d b y
- * t h e c a l l i n g f u n c t i o n !
- * /
- s t a t i c B O O L
- p g w i n 3 2 _ g e t _ d y n a m i c _ t o k e n i n f o ( H A N D L E t o k e n , T O K E N _ I N F O R M A T I O N _ C L A S S c l a s s ,
- c h a r * * I n f o B u f f e r , c h a r * e r r b u f , i n t e r r s i z e )
- {
- D W O R D I n f o B u f f e r S i z e ;
-
- i f ( G e t T o k e n I n f o r m a t i o n ( t o k e n , c l a s s , N U L L , 0 , & I n f o B u f f e r S i z e ) )
- {
- s n p r i n t f ( e r r b u f , e r r s i z e ,
- " c o u l d n o t g e t t o k e n i n f o r m a t i o n b u f f e r s i z e : g o t z e r o s i z e \ n " ) ;
- r e t u r n F A L S E ;
- }
-
- i f ( G e t L a s t E r r o r ( ) ! = E R R O R _ I N S U F F I C I E N T _ B U F F E R )
- {
- s n p r i n t f ( e r r b u f , e r r s i z e ,
- " c o u l d n o t g e t t o k e n i n f o r m a t i o n b u f f e r s i z e : e r r o r c o d e % l u \ n " ,
- G e t L a s t E r r o r ( ) ) ;
- r e t u r n F A L S E ;
- }
-
- * I n f o B u f f e r = m a l l o c ( I n f o B u f f e r S i z e ) ;
- i f ( * I n f o B u f f e r = = N U L L )
- {
- s n p r i n t f ( e r r b u f , e r r s i z e ,
- " c o u l d n o t a l l o c a t e % d b y t e s f o r t o k e n i n f o r m a t i o n \ n " ,
- ( i n t ) I n f o B u f f e r S i z e ) ;
- r e t u r n F A L S E ;
- }
-
- i f ( ! G e t T o k e n I n f o r m a t i o n ( t o k e n , c l a s s , * I n f o B u f f e r ,
- I n f o B u f f e r S i z e , & I n f o B u f f e r S i z e ) )
- {
- s n p r i n t f ( e r r b u f , e r r s i z e ,
- " c o u l d n o t g e t t o k e n i n f o r m a t i o n : e r r o r c o d e % l u \ n " ,
- G e t L a s t E r r o r ( ) ) ;
- r e t u r n F A L S E ;
- }
-
- r e t u r n T R U E ;
- }
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-bugs@postgresql.org
Cc: maumau307@gmail.com, michael.paquier@gmail.com, breen@rtda.com, hlinnaka@iki.fi, alvherre@2ndquadrant.com, pgsql-hackers@postgresql.org
Subject: Re: BUG #13755: pgwin32_is_service not checking if SECURITY_SERVICE_SID is disabled
In-Reply-To: <952A88FFCBDA419EB6D6556B6A8F29C1@tunaPC>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox