BUG #13755: pgwin32_is_service not checking if SECURITY_SERVICE_SID is disabled
The following bug has been logged on the website:
Bug reference: 13755
Logged by: Breen Hagan
Email address: breen@rtda.com
PostgreSQL version: 9.4.4
Operating system: Windows 8.1
Description:
Short version: pgwin32_is_service checks the process token for
SECURITY_SERVICE_RID by doing an EqualSid check. This will match against a
SECURITY_SERVICE_RID that has been disabled ("use_for_deny_only"), causing
PG to think it's a service when it is not. This causes it to attempt to log
to the event log, but this doesn't work, and so there is no logging at all.
Long version: We ship PG with our own product, which may or may not be
installed as a service. When running PG, we run postgres.exe directly via a
Tcl-based wrapper script so that we can monitor the output in real time.
This works as expected when our product is not being run as a service.
When our product is installed as a service, we use CreateRestrictedToken to
disable all admin rights as well as the SECURITY_SERVICE_RID, and use the
returned token with CreateProcessAsUser, for which we also specify
CREATE_NEW_CONSOLE. This process then calls our wrapper script. Inside
this wrapper, I can call GetStdHandle (via Twapi) and get valid handles for
all 3: in, out, and err. Yet when the script calls postgres.exe, nothing is
received on the output. As mentioned above, nothing is logged in the event
log, either.
If you look at
https://msdn.microsoft.com/en-us/library/windows/desktop/aa379554(v=vs.85).aspx,
this code is very similar to pgwin32_is_service (except that it looks for
Admins), but also checks the attributes on the SID to see if it is enabled,
or used for deny only. I believe this check needs to be added to
pgwin32_is_service.
Thanks!
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
On Wed, Nov 4, 2015 at 3:23 PM, <breen@rtda.com> wrote:
Short version: pgwin32_is_service checks the process token for
SECURITY_SERVICE_RID by doing an EqualSid check. This will match against a
SECURITY_SERVICE_RID that has been disabled ("use_for_deny_only"), causing
PG to think it's a service when it is not. This causes it to attempt to log
to the event log, but this doesn't work, and so there is no logging at all.
OK. So if I am following correctly... If Postgres process uses a
SECURITY_SERVICE_RID SID that has SE_GROUP_USE_FOR_DENY_ONLY enabled
it will try to access to the event logs but will be denied as all
accesses are denied with this attribute, right?
What do you think about the patch attached then?
--
Michael
Attachments:
20151105_windows_sid_deny.patchapplication/x-patch; name=20151105_windows_sid_deny.patchDownload
diff --git a/src/backend/port/win32/security.c b/src/backend/port/win32/security.c
index e9cfe15..92dbc9a 100644
--- a/src/backend/port/win32/security.c
+++ b/src/backend/port/win32/security.c
@@ -98,7 +98,9 @@ pgwin32_is_admin(void)
*
* 1) We are running as Local System (only used by services)
* 2) Our token contains SECURITY_SERVICE_RID (automatically added to the
- * process token by the SCM when starting a service)
+ * process token by the SCM when starting a service) without
+ * SE_GROUP_USE_FOR_DENY_ONLY enabled as this would prevent access
+ * to the event logs forcibly.
*
* Return values:
* 0 = Not service
@@ -190,7 +192,10 @@ pgwin32_is_service(void)
{
if (EqualSid(ServiceSid, Groups->Groups[x].Sid))
{
- _is_service = 1;
+ if ((Groups->Groups[x].Attributes & SE_GROUP_USE_FOR_DENY_ONLY) != 0)
+ _is_service = 0;
+ else
+ _is_service = 1;
break;
}
}
Michael,
I'm pretty sure your patch will fix my issue, but perhaps it should be a
positive check for SE_GROUP_ENABLED? I say "perhaps" because the last time
I did any serious Windows coding was 2005.
Thanks for the quick response!
Breen
On Thu, Nov 5, 2015 at 9:39 AM, Michael Paquier <michael.paquier@gmail.com>
wrote:
Show quoted text
On Wed, Nov 4, 2015 at 3:23 PM, <breen@rtda.com> wrote:
Short version: pgwin32_is_service checks the process token for
SECURITY_SERVICE_RID by doing an EqualSid check. This will matchagainst a
SECURITY_SERVICE_RID that has been disabled ("use_for_deny_only"),
causing
PG to think it's a service when it is not. This causes it to attempt to
log
to the event log, but this doesn't work, and so there is no logging at
all.
OK. So if I am following correctly... If Postgres process uses a
SECURITY_SERVICE_RID SID that has SE_GROUP_USE_FOR_DENY_ONLY enabled
it will try to access to the event logs but will be denied as all
accesses are denied with this attribute, right?What do you think about the patch attached then?
--
Michael
On Fri, Nov 6, 2015 at 1:00 AM, Breen Hagan <breen@rtda.com> wrote:
Michael,
(You should avoid top-posting, this breaks the logic of a thread).
I'm pretty sure your patch will fix my issue, but perhaps it should be a
positive check for SE_GROUP_ENABLED?
If we want to be completely consistent with pgwin32_is_admin, that
would be actually the opposite: Postgres should not start with an SID
that has administrator's rights for security reasons.
Btw, I think that you would be interested in this patch as well:
/messages/by-id/CAB7nPqR=FsgqOsQL6qUC04XWbZ93Q9BC-qEmHu2Cvh8uMRNrNQ@mail.gmail.com
This makes pgwin32_is_service available for frontend applications as
well, hence you would not need to duplicate any upstream code and just
reuse it for your scripts. That's material for 9.6~ though. I am
actually planning to fix an old bug in pg_ctl handling of a service
using that.
I say "perhaps" because the last time
I did any serious Windows coding was 2005.
That's short considering these day's life average expectancy.
--
Michael
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
On Sat, Nov 7, 2015 at 4:09 PM, Michael Paquier
<michael.paquier@gmail.com> wrote:
On Fri, Nov 6, 2015 at 1:00 AM, Breen Hagan <breen@rtda.com> wrote:
Michael,
(You should avoid top-posting, this breaks the logic of a thread).
I'm pretty sure your patch will fix my issue, but perhaps it should be a
positive check for SE_GROUP_ENABLED?If we want to be completely consistent with pgwin32_is_admin, that
would be actually the opposite: Postgres should not start with an SID
that has administrator's rights for security reasons.
SECURITY_SERVICE_RID and SECURITY_BUILTIN_DOMAIN_RID are completely
separated concepts... Please ignore that. Still, yeah, it seems that
you are right, we would want SE_GROUP_ENABLED to be enabled to check
if process can access the event logs. Thoughts from any Windows ninja
in the surroundings?
--
Michael
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
On Sat, Nov 7, 2015 at 1:36 AM, Michael Paquier <michael.paquier@gmail.com>
wrote:
On Sat, Nov 7, 2015 at 4:09 PM, Michael Paquier
<michael.paquier@gmail.com> wrote:On Fri, Nov 6, 2015 at 1:00 AM, Breen Hagan <breen@rtda.com> wrote:
Michael,
(You should avoid top-posting, this breaks the logic of a thread).
I'm pretty sure your patch will fix my issue, but perhaps it should be a
positive check for SE_GROUP_ENABLED?If we want to be completely consistent with pgwin32_is_admin, that
would be actually the opposite: Postgres should not start with an SID
that has administrator's rights for security reasons.SECURITY_SERVICE_RID and SECURITY_BUILTIN_DOMAIN_RID are completely
separated concepts... Please ignore that. Still, yeah, it seems that
you are right, we would want SE_GROUP_ENABLED to be enabled to check
if process can access the event logs. Thoughts from any Windows ninja
in the surroundings?
--
Michael
Sorry to bring back a very old thread, but I was wondering if this was ever
resolved? I saw
an item in the 9.4.6 release notes that seemed similar, but upon checking
the code, I see
that pgwin32_is_service() still checks just for the existence of these RIDs
without checking
to see if they are enabled.
Thanks,
Breen
On Wed, Mar 9, 2016 at 11:44 PM, Breen Hagan <breen@rtda.com> wrote:
On Sat, Nov 7, 2015 at 1:36 AM, Michael Paquier <michael.paquier@gmail.com>
wrote:On Sat, Nov 7, 2015 at 4:09 PM, Michael Paquier
<michael.paquier@gmail.com> wrote:On Fri, Nov 6, 2015 at 1:00 AM, Breen Hagan <breen@rtda.com> wrote:
Michael,
(You should avoid top-posting, this breaks the logic of a thread).
I'm pretty sure your patch will fix my issue, but perhaps it should be
a
positive check for SE_GROUP_ENABLED?If we want to be completely consistent with pgwin32_is_admin, that
would be actually the opposite: Postgres should not start with an SID
that has administrator's rights for security reasons.SECURITY_SERVICE_RID and SECURITY_BUILTIN_DOMAIN_RID are completely
separated concepts... Please ignore that. Still, yeah, it seems that
you are right, we would want SE_GROUP_ENABLED to be enabled to check
if process can access the event logs. Thoughts from any Windows ninja
in the surroundings?--
MichaelSorry to bring back a very old thread, but I was wondering if this was ever
resolved? I saw
an item in the 9.4.6 release notes that seemed similar, but upon checking
the code, I see
that pgwin32_is_service() still checks just for the existence of these RIDs
without checking
to see if they are enabled.
This is not resolved yet, this just fell from my radar and I recall
that I spent some time thinking about the consequences and whereabouts
of using either SE_GROUP_ENABLED or SE_GROUP_USE_FOR_DENY_ONLY,
without actually reaching a conclusion. I think that the patch would
be straight-forward. But it needs a bit of review from the author
(Hi!) and some extra input would be welcome. I guess I could try to
look at that again.. That won't be this week for sure though.
--
Michael
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
Michael Paquier wrote:
This is not resolved yet, this just fell from my radar and I recall
that I spent some time thinking about the consequences and whereabouts
of using either SE_GROUP_ENABLED or SE_GROUP_USE_FOR_DENY_ONLY,
without actually reaching a conclusion. I think that the patch would
be straight-forward. But it needs a bit of review from the author
(Hi!) and some extra input would be welcome. I guess I could try to
look at that again.. That won't be this week for sure though.
Bump.
--
�lvaro Herrera http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
On Tue, Apr 5, 2016 at 1:08 AM, Alvaro Herrera <alvherre@2ndquadrant.com> wrote:
Michael Paquier wrote:
This is not resolved yet, this just fell from my radar and I recall
that I spent some time thinking about the consequences and whereabouts
of using either SE_GROUP_ENABLED or SE_GROUP_USE_FOR_DENY_ONLY,
without actually reaching a conclusion. I think that the patch would
be straight-forward. But it needs a bit of review from the author
(Hi!) and some extra input would be welcome. I guess I could try to
look at that again.. That won't be this week for sure though.Bump.
Don't worry. This has not fallen from my radar yet..
--
Michael
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
On Tue, Apr 5, 2016 at 12:58 PM, Michael Paquier
<michael.paquier@gmail.com> wrote:
On Tue, Apr 5, 2016 at 1:08 AM, Alvaro Herrera <alvherre@2ndquadrant.com> wrote:
Michael Paquier wrote:
This is not resolved yet, this just fell from my radar and I recall
that I spent some time thinking about the consequences and whereabouts
of using either SE_GROUP_ENABLED or SE_GROUP_USE_FOR_DENY_ONLY,
without actually reaching a conclusion. I think that the patch would
be straight-forward. But it needs a bit of review from the author
(Hi!) and some extra input would be welcome. I guess I could try to
look at that again.. That won't be this week for sure though.Bump.
Don't worry. This has not fallen from my radar yet..
So I have been looking at this issue again and finished with the patch
attached. I think that it makes the most sense to browse the whole
list of groups, and choose if Postgres is running as a service if
service SID matches with one of the group SIDs listed, on top of which
this group SID should be enabled via SE_GROUP_ENABLED. Checking for
SE_GROUP_USE_FOR_DENY_ONLY would not make much sense, because it would
mean that SE_GROUP_ENABLED is not set, and that's what we are
interested in. That was in short the point of Breen, and it looks to
be the saner way to go.
What do others think?
--
Michael
Attachments:
win32-security-service-v2.patchinvalid/octet-stream; name=win32-security-service-v2.patchDownload
diff --git a/src/port/win32security.c b/src/port/win32security.c
index ab9cd67..cfa0aec 100644
--- a/src/port/win32security.c
+++ b/src/port/win32security.c
@@ -218,7 +218,8 @@ pgwin32_is_service(void)
_is_service = 0;
for (x = 0; x < Groups->GroupCount; x++)
{
- if (EqualSid(ServiceSid, Groups->Groups[x].Sid))
+ if (EqualSid(ServiceSid, Groups->Groups[x].Sid) &&
+ (Groups->Groups[x].Attributes & SE_GROUP_ENABLED))
{
_is_service = 1;
break;
On 04/08/2016 09:48 AM, Michael Paquier wrote:
So I have been looking at this issue again and finished with the patch
attached. I think that it makes the most sense to browse the whole
list of groups, and choose if Postgres is running as a service if
service SID matches with one of the group SIDs listed, on top of which
this group SID should be enabled via SE_GROUP_ENABLED. Checking for
SE_GROUP_USE_FOR_DENY_ONLY would not make much sense, because it would
mean that SE_GROUP_ENABLED is not set, and that's what we are
interested in. That was in short the point of Breen, and it looks to
be the saner way to go.
Yeah, seems like the right way. pgwin32_is_admin() also checks for
SE_GROUP_ENABLED.
I think this is ready to be committed, except that I don't have an easy
way to reproduce the original problem to test this. I suppose I could
write a test program to call CreateRestrictedToken() and
CreateProcessAsUser(), but would rather avoid the work. Breen, if I push
a fix for this, can you build from sources and verify that it fixes your
original problem? Or alternatively, can you provide a test program that
I can use to verify it?
- Heikki
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
Hi,
Sorry for the delay in response. We don't presently build postgres for
Windows (we do for linux and macos), but I'm willing to give it a shot if
there is a solid doc on setting up the build. That would probably be
easier than doing a test program.
Breen
On Wed, Sep 21, 2016 at 7:50 AM, Heikki Linnakangas <hlinnaka@iki.fi> wrote:
Show quoted text
On 04/08/2016 09:48 AM, Michael Paquier wrote:
So I have been looking at this issue again and finished with the patch
attached. I think that it makes the most sense to browse the whole
list of groups, and choose if Postgres is running as a service if
service SID matches with one of the group SIDs listed, on top of which
this group SID should be enabled via SE_GROUP_ENABLED. Checking for
SE_GROUP_USE_FOR_DENY_ONLY would not make much sense, because it would
mean that SE_GROUP_ENABLED is not set, and that's what we are
interested in. That was in short the point of Breen, and it looks to
be the saner way to go.Yeah, seems like the right way. pgwin32_is_admin() also checks for
SE_GROUP_ENABLED.I think this is ready to be committed, except that I don't have an easy
way to reproduce the original problem to test this. I suppose I could write
a test program to call CreateRestrictedToken() and CreateProcessAsUser(),
but would rather avoid the work. Breen, if I push a fix for this, can you
build from sources and verify that it fixes your original problem? Or
alternatively, can you provide a test program that I can use to verify it?- Heikki
On Sat, Sep 24, 2016 at 2:55 AM, Breen Hagan <breen@rtda.com> wrote:
Sorry for the delay in response. We don't presently build postgres for
Windows (we do for linux and macos), but I'm willing to give it a shot if
there is a solid doc on setting up the build. That would probably be easier
than doing a test program.
There is a whole chapter in the docs in the matter:
https://www.postgresql.org/docs/9.0/static/install-windows.html
--
Michael
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
On Sat, Sep 24, 2016 at 8:52 AM, Michael Paquier
<michael.paquier@gmail.com> wrote:
On Sat, Sep 24, 2016 at 2:55 AM, Breen Hagan <breen@rtda.com> wrote:
Sorry for the delay in response. We don't presently build postgres for
Windows (we do for linux and macos), but I'm willing to give it a shot if
there is a solid doc on setting up the build. That would probably be easier
than doing a test program.There is a whole chapter in the docs in the matter:
https://www.postgresql.org/docs/9.0/static/install-windows.html
(Moved to next CF, with same status "Ready for committer").
--
Michael
--
Sent via pgsql-bugs mailing list (pgsql-bugs@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-bugs
Hello,
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
Attachments:
win32-security_service-v3.patchapplication/octet-stream; name=win32-security_service-v3.patchDownload
��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 ;
- }
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
Attachments:
win32-security_service-v3.patchapplication/octet-stream; name=win32-security_service-v3.patchDownload
��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 ;
- }
On Sun, Nov 6, 2016 at 6:30 PM, MauMau <maumau307@gmail.com> wrote:
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.
No problem, I still see a unique thread so that's not an issue seen from here.
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.
So you see the same behavior with the patch I sent and your
refactoring, right? If yes, backpatching the one-liner is the safest
bet to me. We could keep the refactoring for HEAD if it makes sense.
Something is wrong with the format of your patch by the way. My
Windows and even OSX environments recognize it as a binary file,
though I can read it in any editor and I cannot apply it cleanly with
a simple patch command. Could you send it again and double-check?
To reproduce the OP's problem, I modified pg_ctl.c to disable
SECURITY_SERVICE_RID when spawning postgres.exe.
So basically you allocated a SID to drop via AllocateAndInitializeSid,
called _CreateRestrictedToken and let the process being spawned? I
think that this is the patch attached
(win32-disable-service-rid.patch). Could you confirm? I want to be
sure that we are testing the same things.
--
Michael
Attachments:
win32-disable-service-rid.patchtext/x-patch; charset=US-ASCII; name=win32-disable-service-rid.patchDownload
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 4b47602..56c7f2e 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -1738,7 +1738,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
HANDLE origToken;
HANDLE restrictedToken;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
- SID_AND_ATTRIBUTES dropSids[2];
+ SID_AND_ATTRIBUTES dropSids[3];
/* Functions loaded dynamically */
__CreateRestrictedToken _CreateRestrictedToken = NULL;
@@ -1790,7 +1790,10 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
0, &dropSids[0].Sid) ||
!AllocateAndInitializeSid(&NtAuthority, 2,
SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS, 0, 0, 0, 0, 0,
- 0, &dropSids[1].Sid))
+ 0, &dropSids[1].Sid) ||
+ !AllocateAndInitializeSid(&NtAuthority, 1,
+ SECURITY_SERVICE_RID, 0, 0, 0, 0, 0, 0,
+ 0, &dropSids[2].Sid))
{
write_stderr(_("%s: could not allocate SIDs: error code %lu\n"),
progname, (unsigned long) GetLastError());
@@ -1805,6 +1808,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
0, NULL,
&restrictedToken);
+ FreeSid(dropSids[2].Sid);
FreeSid(dropSids[1].Sid);
FreeSid(dropSids[0].Sid);
CloseHandle(origToken);
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
On Sun, Nov 6, 2016 at 6:30 PM, MauMau <maumau307@gmail.com> wrote: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.No problem, I still see a unique thread so that's not an issue seen from
here.
You are right. A while after I sent the second mail, I noticed the CommitFest app collected both of my mails. I was just impatient.
So you see the same behavior with the patch I sent and your refactoring,
right? If yes, backpatching the one-liner is the safest bet to me. We could
keep the refactoring for HEAD if it makes sense.
Yes. And It's fine to me that your patch will be applied to previous releases and my patch to HEAD only. This is a good (rare?) chance to reduce the Windows-specific code, so I want to take advantage of it.
Something is wrong with the format of your patch by the way. My Windows
and even OSX environments recognize it as a binary file, though I can read
it in any editor and I cannot apply it cleanly with a simple patch command.
Could you send it again and double-check?
Ouch, the Git shell included in GitHub Desktop for Windows produced the diff in UTF-16 and CR/LF line terminators. I haven't found how to fix it, so I generated the attached patch on Linux. Please check it.
To reproduce the OP's problem, I modified pg_ctl.c to disable
SECURITY_SERVICE_RID when spawning postgres.exe.So basically you allocated a SID to drop via AllocateAndInitializeSid,
called _CreateRestrictedToken and let the process being spawned? I think
that this is the patch attached (win32-disable-service-rid.patch). Could
you confirm? I want to be sure that we are testing the same things.
Yes, I did the same.
Regards
Takayuki Tsunakawa
Attachments:
win32-security-service-v4.patchapplication/octet-stream; name=win32-security-service-v4.patchDownload
diff --git a/src/port/win32security.c b/src/port/win32security.c
index 2c9ca15..3b22f16 100644
--- a/src/port/win32security.c
+++ b/src/port/win32security.c
@@ -18,11 +18,6 @@
#endif
-static BOOL pgwin32_get_dynamic_tokeninfo(HANDLE token,
- TOKEN_INFORMATION_CLASS class,
- char **InfoBuffer, char *errbuf, int errsize);
-
-
/*
* Utility wrapper for frontend and backend when reporting an error
* message.
@@ -53,33 +48,11 @@ log_error(const char *fmt,...)
int
pgwin32_is_admin(void)
{
- HANDLE AccessToken;
- char *InfoBuffer = NULL;
- char errbuf[256];
- PTOKEN_GROUPS Groups;
PSID AdministratorsSid;
PSID PowerUsersSid;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
- UINT x;
- BOOL success;
-
- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
- {
- log_error(_("could not open process token: error code %lu\n"),
- GetLastError());
- exit(1);
- }
-
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenGroups,
- &InfoBuffer, errbuf, sizeof(errbuf)))
- {
- log_error("%s", errbuf);
- exit(1);
- }
-
- Groups = (PTOKEN_GROUPS) InfoBuffer;
-
- CloseHandle(AccessToken);
+ BOOL IsAdministrators;
+ BOOL IsPowerUsers;
if (!AllocateAndInitializeSid(&NtAuthority, 2,
SECURITY_BUILTIN_DOMAIN_RID,
@@ -101,24 +74,21 @@ pgwin32_is_admin(void)
exit(1);
}
- success = FALSE;
-
- for (x = 0; x < Groups->GroupCount; x++)
+ if (!CheckTokenMembership(NULL, AdministratorsSid, &IsAdministrators) ||
+ !CheckTokenMembership(NULL, PowerUsersSid, &IsPowerUsers))
{
- if ((EqualSid(AdministratorsSid, Groups->Groups[x].Sid) &&
- (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)) ||
- (EqualSid(PowerUsersSid, Groups->Groups[x].Sid) &&
- (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)))
- {
- success = TRUE;
- break;
- }
+ log_error("could not check access token membership: error code %lu\n",
+ GetLastError());
+ exit(1);
}
- free(InfoBuffer);
FreeSid(AdministratorsSid);
FreeSid(PowerUsersSid);
- return success;
+
+ if (IsAdministrators || IsPowerUsers)
+ return 1;
+ else
+ return 0;
}
/*
@@ -143,140 +113,63 @@ int
pgwin32_is_service(void)
{
static int _is_service = -1;
- HANDLE AccessToken;
- char *InfoBuffer = NULL;
- char errbuf[256];
- PTOKEN_GROUPS Groups;
- PTOKEN_USER User;
+ BOOL IsMember;
PSID ServiceSid;
PSID LocalSystemSid;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
- UINT x;
/* Only check the first time */
if (_is_service != -1)
return _is_service;
- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
- {
- fprintf(stderr, "could not open process token: error code %lu\n",
- GetLastError());
- return -1;
- }
-
- /* First check for local system */
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenUser, &InfoBuffer,
- errbuf, sizeof(errbuf)))
- {
- fprintf(stderr, "%s", errbuf);
- return -1;
- }
-
- User = (PTOKEN_USER) InfoBuffer;
-
+ /* First check for Local System */
if (!AllocateAndInitializeSid(&NtAuthority, 1,
SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0,
&LocalSystemSid))
{
- fprintf(stderr, "could not get SID for local system account\n");
- CloseHandle(AccessToken);
+ fprintf(stderr, "could not get SID for Local System account: error code %lu\n",
+ GetLastError());
return -1;
}
- if (EqualSid(LocalSystemSid, User->User.Sid))
+ if (!CheckTokenMembership(NULL, LocalSystemSid, &IsMember))
{
+ fprintf(stderr, "could not check access token membership: error code %lu\n",
+ GetLastError());
FreeSid(LocalSystemSid);
- free(InfoBuffer);
- CloseHandle(AccessToken);
- _is_service = 1;
- return _is_service;
+ return -1;
}
-
FreeSid(LocalSystemSid);
- free(InfoBuffer);
- /* Now check for group SID */
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenGroups, &InfoBuffer,
- errbuf, sizeof(errbuf)))
+ if (IsMember)
{
- fprintf(stderr, "%s", errbuf);
- return -1;
+ _is_service = 1;
+ return _is_service;
}
- Groups = (PTOKEN_GROUPS) InfoBuffer;
-
+ /* Next check for service group */
if (!AllocateAndInitializeSid(&NtAuthority, 1,
SECURITY_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0,
&ServiceSid))
{
- fprintf(stderr, "could not get SID for service group\n");
- free(InfoBuffer);
- CloseHandle(AccessToken);
+ fprintf(stderr, "could not get SID for service group: error code %lu\n",
+ GetLastError());
return -1;
}
- _is_service = 0;
- for (x = 0; x < Groups->GroupCount; x++)
+ if (!CheckTokenMembership(NULL, ServiceSid, &IsMember))
{
- if (EqualSid(ServiceSid, Groups->Groups[x].Sid))
- {
- _is_service = 1;
- break;
- }
+ fprintf(stderr, "could not check access token membership: error code %lu\n",
+ GetLastError());
+ FreeSid(ServiceSid);
+ return -1;
}
-
- free(InfoBuffer);
FreeSid(ServiceSid);
- CloseHandle(AccessToken);
+ if (IsMember)
+ _is_service = 1;
+ else
+ _is_service = 0;
return _is_service;
}
-
-
-/*
- * Call GetTokenInformation() on a token and return a dynamically sized
- * buffer with the information in it. This buffer must be free():d by
- * the calling function!
- */
-static BOOL
-pgwin32_get_dynamic_tokeninfo(HANDLE token, TOKEN_INFORMATION_CLASS class,
- char **InfoBuffer, char *errbuf, int errsize)
-{
- DWORD InfoBufferSize;
-
- if (GetTokenInformation(token, class, NULL, 0, &InfoBufferSize))
- {
- snprintf(errbuf, errsize,
- "could not get token information buffer size: got zero size\n");
- return FALSE;
- }
-
- if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
- {
- snprintf(errbuf, errsize,
- "could not get token information buffer size: error code %lu\n",
- GetLastError());
- return FALSE;
- }
-
- *InfoBuffer = malloc(InfoBufferSize);
- if (*InfoBuffer == NULL)
- {
- snprintf(errbuf, errsize,
- "could not allocate %d bytes for token information\n",
- (int) InfoBufferSize);
- return FALSE;
- }
-
- if (!GetTokenInformation(token, class, *InfoBuffer,
- InfoBufferSize, &InfoBufferSize))
- {
- snprintf(errbuf, errsize,
- "could not get token information: error code %lu\n",
- GetLastError());
- return FALSE;
- }
-
- return TRUE;
-}
On Mon, Nov 7, 2016 at 9:49 AM, Tsunakawa, Takayuki
<tsunakawa.takay@jp.fujitsu.com> wrote:
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
On Sun, Nov 6, 2016 at 6:30 PM, MauMau <maumau307@gmail.com> wrote:
So you see the same behavior with the patch I sent and your refactoring,
right? If yes, backpatching the one-liner is the safest bet to me. We could
keep the refactoring for HEAD if it makes sense.Yes. And It's fine to me that your patch will be applied to previous releases and my patch to HEAD only. This is a good (rare?) chance to reduce the Windows-specific code, so I want to take advantage of it.
Yes, I can follow that argument.
Something is wrong with the format of your patch by the way. My Windows
and even OSX environments recognize it as a binary file, though I can read
it in any editor and I cannot apply it cleanly with a simple patch command.
Could you send it again and double-check?Ouch, the Git shell included in GitHub Desktop for Windows produced the diff in UTF-16 and CR/LF line terminators. I haven't found how to fix it, so I generated the attached patch on Linux. Please check it.
And the patch got twice smaller in size. Thanks.
To reproduce the OP's problem, I modified pg_ctl.c to disable
SECURITY_SERVICE_RID when spawning postgres.exe.So basically you allocated a SID to drop via AllocateAndInitializeSid,
called _CreateRestrictedToken and let the process being spawned? I think
that this is the patch attached (win32-disable-service-rid.patch). Could
you confirm? I want to be sure that we are testing the same things.Yes, I did the same.
Hm.. I have just tested HEAD, my patch and your patch using my patch
test on pg_ctl.c, but I am always getting pgwin32_is_service set to 0
when running pg_ctl start from a terminal, and set it to 1 when
running pg_ctl service to register the service startup. Could you
precise in which ways you started the Postgres instance and could you
post the patch of pg_ctl you used? I am afraid that I am taking it
incorrectly because I am not able to see any differences.
Also, did you test the patch I posted and were you able to see the
same differences as with your patch? I still think that my short patch
is logically correct but if the tests are not we are in a no-go
position for any fix posted on this thread.
--
Michael
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
From: Michael Paquier
Hm.. I have just tested HEAD, my patch and your patch using my patch
test on pg_ctl.c, but I am always getting pgwin32_is_service set to 0
when running pg_ctl start from a terminal, and set it to 1 when
running pg_ctl service to register the service startup. Could you
precise in which ways you started the Postgres instance and could you
post the patch of pg_ctl you used? I am afraid that I am taking it
incorrectly because I am not able to see any differences.
Also, did you test the patch I posted and were you able to see the
same differences as with your patch? I still think that my short patch
is logically correct but if the tests are not we are in a no-go
position for any fix posted on this thread.
Yes, I tested both your patch and mine. I used the attached pg_ctl.c.
It adds -z option which disables SECURITY_SERVICE_RID.
I registered the service with "pg_ctl register -N pg -D
datadir -w -z -S demand -U myuser -P mypass", then started the service
with "net start pg". The following messages were output in the server
log:
LOG: pgwin32_is_admin = 0
LOG: pgwin32_is_service = 0
LOG: database system was shut down at 2016-11-07 22:04:46 JST
LOG: MultiXact member wraparound protections are now enabled
LOG: database system is ready to accept connections
LOG: autovacuum launcher started
Without -z, the message becomes "pgwin32_is_service = 1". And without
the win32security.c patch, "pgwin32_is_service = 1" is output.
I guess you registered the service without specifying the service
account with -U. Then the service runs as the Local System account,
whence pgwin32_is_service() returns 1.
Regards
Takayuki Tsunakawa
Attachments:
Hi, Michael
As I guessed in the previous mail, both our patches cause
pgwin32_is_service() to return 1 even when SECURITY_SERVICE_RID is
disabled, if the service is running as a Local System. The existing
logic of checking for Local System should be removed. The attached
patch fixes this problem.
Regards
Takayuki Tsunakawa
Attachments:
win32-security-service-v5.patchapplication/octet-stream; name=win32-security-service-v5.patchDownload
diff --git a/src/port/win32security.c b/src/port/win32security.c
index 2c9ca15..9e65e60 100644
--- a/src/port/win32security.c
+++ b/src/port/win32security.c
@@ -18,11 +18,6 @@
#endif
-static BOOL pgwin32_get_dynamic_tokeninfo(HANDLE token,
- TOKEN_INFORMATION_CLASS class,
- char **InfoBuffer, char *errbuf, int errsize);
-
-
/*
* Utility wrapper for frontend and backend when reporting an error
* message.
@@ -53,33 +48,11 @@ log_error(const char *fmt,...)
int
pgwin32_is_admin(void)
{
- HANDLE AccessToken;
- char *InfoBuffer = NULL;
- char errbuf[256];
- PTOKEN_GROUPS Groups;
PSID AdministratorsSid;
PSID PowerUsersSid;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
- UINT x;
- BOOL success;
-
- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
- {
- log_error(_("could not open process token: error code %lu\n"),
- GetLastError());
- exit(1);
- }
-
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenGroups,
- &InfoBuffer, errbuf, sizeof(errbuf)))
- {
- log_error("%s", errbuf);
- exit(1);
- }
-
- Groups = (PTOKEN_GROUPS) InfoBuffer;
-
- CloseHandle(AccessToken);
+ BOOL IsAdministrators;
+ BOOL IsPowerUsers;
if (!AllocateAndInitializeSid(&NtAuthority, 2,
SECURITY_BUILTIN_DOMAIN_RID,
@@ -101,32 +74,26 @@ pgwin32_is_admin(void)
exit(1);
}
- success = FALSE;
-
- for (x = 0; x < Groups->GroupCount; x++)
+ if (!CheckTokenMembership(NULL, AdministratorsSid, &IsAdministrators) ||
+ !CheckTokenMembership(NULL, PowerUsersSid, &IsPowerUsers))
{
- if ((EqualSid(AdministratorsSid, Groups->Groups[x].Sid) &&
- (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)) ||
- (EqualSid(PowerUsersSid, Groups->Groups[x].Sid) &&
- (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)))
- {
- success = TRUE;
- break;
- }
+ log_error("could not check access token membership: error code %lu\n",
+ GetLastError());
+ exit(1);
}
- free(InfoBuffer);
FreeSid(AdministratorsSid);
FreeSid(PowerUsersSid);
- return success;
+
+ if (IsAdministrators || IsPowerUsers)
+ return 1;
+ else
+ return 0;
}
/*
- * We consider ourselves running as a service if one of the following is
- * true:
- *
- * 1) We are running as Local System (only used by services)
- * 2) Our token contains SECURITY_SERVICE_RID (automatically added to the
+ * We consider ourselves running as a service if
+ * our token contains SECURITY_SERVICE_RID (automatically added to the
* process token by the SCM when starting a service)
*
* Return values:
@@ -143,140 +110,37 @@ int
pgwin32_is_service(void)
{
static int _is_service = -1;
- HANDLE AccessToken;
- char *InfoBuffer = NULL;
- char errbuf[256];
- PTOKEN_GROUPS Groups;
- PTOKEN_USER User;
+ BOOL IsMember;
PSID ServiceSid;
- PSID LocalSystemSid;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
- UINT x;
/* Only check the first time */
if (_is_service != -1)
return _is_service;
- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
- {
- fprintf(stderr, "could not open process token: error code %lu\n",
- GetLastError());
- return -1;
- }
-
- /* First check for local system */
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenUser, &InfoBuffer,
- errbuf, sizeof(errbuf)))
- {
- fprintf(stderr, "%s", errbuf);
- return -1;
- }
-
- User = (PTOKEN_USER) InfoBuffer;
-
- if (!AllocateAndInitializeSid(&NtAuthority, 1,
- SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0,
- &LocalSystemSid))
- {
- fprintf(stderr, "could not get SID for local system account\n");
- CloseHandle(AccessToken);
- return -1;
- }
-
- if (EqualSid(LocalSystemSid, User->User.Sid))
- {
- FreeSid(LocalSystemSid);
- free(InfoBuffer);
- CloseHandle(AccessToken);
- _is_service = 1;
- return _is_service;
- }
-
- FreeSid(LocalSystemSid);
- free(InfoBuffer);
-
- /* Now check for group SID */
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenGroups, &InfoBuffer,
- errbuf, sizeof(errbuf)))
- {
- fprintf(stderr, "%s", errbuf);
- return -1;
- }
-
- Groups = (PTOKEN_GROUPS) InfoBuffer;
-
+ /* Check for service group membership */
if (!AllocateAndInitializeSid(&NtAuthority, 1,
SECURITY_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0,
&ServiceSid))
{
- fprintf(stderr, "could not get SID for service group\n");
- free(InfoBuffer);
- CloseHandle(AccessToken);
+ fprintf(stderr, "could not get SID for service group: error code %lu\n",
+ GetLastError());
return -1;
}
- _is_service = 0;
- for (x = 0; x < Groups->GroupCount; x++)
+ if (!CheckTokenMembership(NULL, ServiceSid, &IsMember))
{
- if (EqualSid(ServiceSid, Groups->Groups[x].Sid))
- {
- _is_service = 1;
- break;
- }
+ fprintf(stderr, "could not check access token membership: error code %lu\n",
+ GetLastError());
+ FreeSid(ServiceSid);
+ return -1;
}
-
- free(InfoBuffer);
FreeSid(ServiceSid);
- CloseHandle(AccessToken);
+ if (IsMember)
+ _is_service = 1;
+ else
+ _is_service = 0;
return _is_service;
}
-
-
-/*
- * Call GetTokenInformation() on a token and return a dynamically sized
- * buffer with the information in it. This buffer must be free():d by
- * the calling function!
- */
-static BOOL
-pgwin32_get_dynamic_tokeninfo(HANDLE token, TOKEN_INFORMATION_CLASS class,
- char **InfoBuffer, char *errbuf, int errsize)
-{
- DWORD InfoBufferSize;
-
- if (GetTokenInformation(token, class, NULL, 0, &InfoBufferSize))
- {
- snprintf(errbuf, errsize,
- "could not get token information buffer size: got zero size\n");
- return FALSE;
- }
-
- if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
- {
- snprintf(errbuf, errsize,
- "could not get token information buffer size: error code %lu\n",
- GetLastError());
- return FALSE;
- }
-
- *InfoBuffer = malloc(InfoBufferSize);
- if (*InfoBuffer == NULL)
- {
- snprintf(errbuf, errsize,
- "could not allocate %d bytes for token information\n",
- (int) InfoBufferSize);
- return FALSE;
- }
-
- if (!GetTokenInformation(token, class, *InfoBuffer,
- InfoBufferSize, &InfoBufferSize))
- {
- snprintf(errbuf, errsize,
- "could not get token information: error code %lu\n",
- GetLastError());
- return FALSE;
- }
-
- return TRUE;
-}
On Mon, Nov 7, 2016 at 10:31 PM, MauMau <maumau307@gmail.com> wrote:
Yes, I tested both your patch and mine. I used the attached pg_ctl.c.
It adds -z option which disables SECURITY_SERVICE_RID.
Okay, so you did exactly what I did except that you wrapped with an option...
I guess you registered the service without specifying the service
account with -U. Then the service runs as the Local System account,
whence pgwin32_is_service() returns 1.
Thank you, that's as you said. I was just using the local user account
which is why I did not see the difference. And now I can. I finished
by not using your version of pg_ctl but mine still the result is the
same. Hm, now that we are two folks able to test the difference, I'd
suggest that a committer pops up and pushes the one-liner patch I sent
upthread and back-patches it.
For the refactoring, I guess that we could sort that later on, and I
promise to look at soon. The issue reported on this thread has been
here for 1 year, I am glad that someone finally came up an easy way to
test things.
--
Michael
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
On Tue, Nov 8, 2016 at 6:47 AM, MauMau <maumau307@gmail.com> wrote:
As I guessed in the previous mail, both our patches cause
pgwin32_is_service() to return 1 even when SECURITY_SERVICE_RID is
disabled, if the service is running as a Local System. The existing
logic of checking for Local System should be removed. The attached
patch fixes this problem.
Meh. Local System accounts are used only by services (see comments of
pgwin32_is_service), so I'd expect pgwin32_is_service() to return true
in this case, contrary to what your v5 is doing. v4 is doing it better
I think at quick glance.
Here are the diffs between your v4 and v5 of this refactoring btw for
people wondering:
/*
- * We consider ourselves running as a service if one of the following is
- * true:
- *
- * 1) We are running as Local System (only used by services)
- * 2) Our token contains SECURITY_SERVICE_RID (automatically added to the
+ * We consider ourselves running as a service if
+ * our token contains SECURITY_SERVICE_RID (automatically added to the
* process token by the SCM when starting a service)
*
* Return values:
@@ -115,39 +112,13 @@ pgwin32_is_service(void)
static int _is_service = -1;
BOOL IsMember;
PSID ServiceSid;
- PSID LocalSystemSid;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; /* Only check the first time */
if (_is_service != -1)
return _is_service;
- /* First check for Local System */
- if (!AllocateAndInitializeSid(&NtAuthority, 1,
- SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0,
- &LocalSystemSid))
- {
- fprintf(stderr, "could not get SID for Local System account:
error code %lu\n",
- GetLastError());
- return -1;
- }
-
- if (!CheckTokenMembership(NULL, LocalSystemSid, &IsMember))
- {
- fprintf(stderr, "could not check access token membership:
error code %lu\n",
- GetLastError());
- FreeSid(LocalSystemSid);
- return -1;
- }
- FreeSid(LocalSystemSid);
-
- if (IsMember)
- {
- _is_service = 1;
- return _is_service;
- }
-
- /* Next check for service group */
+ /* Check for service group membership */Not relying on the fact that local system accounts are only used by
services looks bad to me.
--
Michael
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
Meh. Local System accounts are used only by services (see comments of
pgwin32_is_service), so I'd expect pgwin32_is_service() to return true in
this case, contrary to what your v5 is doing. v4 is doing it better I think
at quick glance.
Not relying on the fact that local system accounts are only used by services
looks bad to me.
I believe v5 is correct for two reasons:
(1)
SECURITY_SERVICE_RID is enough to check, because the process gets SECURITY_SERVICE_RID when it runs as a service.
https://msdn.microsoft.com/ja-jp/library/windows/desktop/aa379649(v=vs.85).aspx
SECURITY_SERVICE_RID
Accounts authorized to log on as a service. This is a group identifier added to the token of a process when it was logged as a service. The corresponding logon type is LOGON32_LOGON_SERVICE.
I saw descriptions that LocalSystem is used by the SCM, but didn't find a statement that LocalSystem is used only by SCM and services. In addition, if the check for LocalSystem is really necessary, LocalService and NetworkService also need to be checked.
https://msdn.microsoft.com/ja-jp/library/windows/desktop/ms684190(v=vs.85).aspx
(Japanese article)
http://www.atmarkit.co.jp/ait/articles/0905/08/news095.html
(2)
The OP wants to explicitly run postgres.exe outside the service even when his app runs as a service, so that the app can read postgres's messages from its stdout/stderr. So, he disabled SECURITY_SERVICE_RID when starting postgres.exe. His users may run his app as a service under LocalSystem.
[Excerpt]
--------------------------------------------------
We ship PG with our own product, which may or may not be
installed as a service. When running PG, we run postgres.exe directly via a
Tcl-based wrapper script so that we can monitor the output in real time.
When our product is installed as a service, we use CreateRestrictedToken to
disable all admin rights as well as the SECURITY_SERVICE_RID, and use the
returned token with CreateProcessAsUser, for which we also specify
CREATE_NEW_CONSOLE. This process then calls our wrapper script. Inside
this wrapper, I can call GetStdHandle (via Twapi) and get valid handles for
all 3: in, out, and err. Yet when the script calls postgres.exe, nothing is
received on the output. As mentioned above, nothing is logged in the event
log, either.
--------------------------------------------------
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-hackers
On Tue, Nov 8, 2016 at 11:36 AM, Tsunakawa, Takayuki
<tsunakawa.takay@jp.fujitsu.com> wrote:
SECURITY_SERVICE_RID
Accounts authorized to log on as a service. This is a group identifier added to the token of a process when it was logged as a service. The corresponding logon type is LOGON32_LOGON_SERVICE.I saw descriptions that LocalSystem is used by the SCM, but didn't find a statement that LocalSystem is used only by SCM and services. In addition, if the check for LocalSystem is really necessary, LocalService and NetworkService also need to be checked.
https://msdn.microsoft.com/ja-jp/library/windows/desktop/ms684190(v=vs.85).aspx
That's what I looked at as well :) And this part is what caught my
attention, meaning that it is not used by anything else than the SCM:
"The LocalSystem account is a predefined local account used by the
service control manager."
And this implies, at least it seems to me, that trying to run Postgres
as this user is actually not something you'd want to do.
(2)
The OP wants to explicitly run postgres.exe outside the service even when his app runs as a service, so that the app can read postgres's messages from its stdout/stderr. So, he disabled SECURITY_SERVICE_RID when starting postgres.exe. His users may run his app as a service under LocalSystem.
Good question, and I don't know how this is used.
--
Michael
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
https://msdn.microsoft.com/ja-jp/library/windows/desktop/ms684190(v=vs.85).aspx
That's what I looked at as well :) And this part is what caught my attention,
meaning that it is not used by anything else than the SCM:
"The LocalSystem account is a predefined local account used by the service
control manager."
The same thing is said about other two special accounts, so they need to be checked if we really believe we need to check for LocalSystem.
"The LocalService account is a predefined local account used by the service control manager."
"The NetworkService account is a predefined local account used by the service control manager."
But, in practice, SECURITY_SERVICE_RID has turned out to be enough.
And this implies, at least it seems to me, that trying to run Postgres as
this user is actually not something you'd want to do.
Yes, I think people should avoid using LocalSystem for user services like PostgreSQL for security reasons. But the Services applet in the Control Panel allows to select LocalSystem, and pg_ctl register creates a service with LocalSystem account when -U is omitted.
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-hackers
On Tue, Nov 8, 2016 at 12:16 PM, Tsunakawa, Takayuki
<tsunakawa.takay@jp.fujitsu.com> wrote:
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
https://msdn.microsoft.com/ja-jp/library/windows/desktop/ms684190(v=vs.85).aspx
That's what I looked at as well :) And this part is what caught my attention,
meaning that it is not used by anything else than the SCM:
"The LocalSystem account is a predefined local account used by the service
control manager."The same thing is said about other two special accounts, so they need to be checked if we really believe we need to check for LocalSystem.
"The LocalService account is a predefined local account used by the service control manager."
"The NetworkService account is a predefined local account used by the service control manager."But, in practice, SECURITY_SERVICE_RID has turned out to be enough.
Hm... See here:
http://stackoverflow.com/questions/6084547/how-to-check-whether-a-process-is-running-as-a-windows-service
And particularly this quote:
"No, that is not reliable because if a service is started from command
line for example it will not have this token. "
--
Michael
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
Hm... See here:
http://stackoverflow.com/questions/6084547/how-to-check-whether-a-proc
ess-is-running-as-a-windows-service
And particularly this quote:
"No, that is not reliable because if a service is started from command line
for example it will not have this token. "
Is there any Microsoft document that states this? I don't think the above comment is correct, because SECURITY_SERVICE_RID was present when I started the service from command line with "net start".
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-hackers
On Tue, Nov 8, 2016 at 1:36 PM, Tsunakawa, Takayuki
<tsunakawa.takay@jp.fujitsu.com> wrote:
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
Hm... See here:
http://stackoverflow.com/questions/6084547/how-to-check-whether-a-proc
ess-is-running-as-a-windows-service
And particularly this quote:
"No, that is not reliable because if a service is started from command line
for example it will not have this token. "Is there any Microsoft document that states this? I don't think the above comment is correct, because SECURITY_SERVICE_RID was present when I started the service from command line with "net start".
Not that I can see of... So maybe I'm just confused by this comment as
it is added by the SCM itself, right?
Things are this way since b15f9b08 that introduced
pgwin32_is_service(). Still, by considering what you say, you
definitely have a point that if postgres is started by another service
running as Local System logs are going where they should not. Let's
remove the check for LocalSystem but still check for SE_GROUP_ENABLED.
So, without any refactoring work, isn't the attached patch just but
fine? That seems to work properly for me.
--
Michael
Attachments:
win32-security-service-v6.patchtext/x-patch; charset=US-ASCII; name=win32-security-service-v6.patchDownload
diff --git a/src/port/win32security.c b/src/port/win32security.c
index 2c9ca15..e329eb0 100644
--- a/src/port/win32security.c
+++ b/src/port/win32security.c
@@ -122,12 +122,9 @@ pgwin32_is_admin(void)
}
/*
- * We consider ourselves running as a service if one of the following is
- * true:
- *
- * 1) We are running as Local System (only used by services)
- * 2) Our token contains SECURITY_SERVICE_RID (automatically added to the
- * process token by the SCM when starting a service)
+ * We consider ourselves running as a service if our token contains
+ * SECURITY_SERVICE_RID, which is automatically added to the process token
+ * by the SCM when starting a service.
*
* Return values:
* 0 = Not service
@@ -147,9 +144,7 @@ pgwin32_is_service(void)
char *InfoBuffer = NULL;
char errbuf[256];
PTOKEN_GROUPS Groups;
- PTOKEN_USER User;
PSID ServiceSid;
- PSID LocalSystemSid;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
UINT x;
@@ -164,37 +159,6 @@ pgwin32_is_service(void)
return -1;
}
- /* First check for local system */
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenUser, &InfoBuffer,
- errbuf, sizeof(errbuf)))
- {
- fprintf(stderr, "%s", errbuf);
- return -1;
- }
-
- User = (PTOKEN_USER) InfoBuffer;
-
- if (!AllocateAndInitializeSid(&NtAuthority, 1,
- SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0,
- &LocalSystemSid))
- {
- fprintf(stderr, "could not get SID for local system account\n");
- CloseHandle(AccessToken);
- return -1;
- }
-
- if (EqualSid(LocalSystemSid, User->User.Sid))
- {
- FreeSid(LocalSystemSid);
- free(InfoBuffer);
- CloseHandle(AccessToken);
- _is_service = 1;
- return _is_service;
- }
-
- FreeSid(LocalSystemSid);
- free(InfoBuffer);
-
/* Now check for group SID */
if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenGroups, &InfoBuffer,
errbuf, sizeof(errbuf)))
@@ -218,7 +182,8 @@ pgwin32_is_service(void)
_is_service = 0;
for (x = 0; x < Groups->GroupCount; x++)
{
- if (EqualSid(ServiceSid, Groups->Groups[x].Sid))
+ if (EqualSid(ServiceSid, Groups->Groups[x].Sid) &&
+ (Groups->Groups[x].Attributes & SE_GROUP_ENABLED))
{
_is_service = 1;
break;
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
Things are this way since b15f9b08 that introduced pgwin32_is_service().
Still, by considering what you say, you definitely have a point that if
postgres is started by another service running as Local System logs are
going where they should not. Let's remove the check for LocalSystem but
still check for SE_GROUP_ENABLED.
So, without any refactoring work, isn't the attached patch just but fine?
That seems to work properly for me.
Just taking a look at the patch, I'm sure it will work.
Committer (Heikki?),
v5 is refactored for HEAD, and v6 is for previous releases without refactoring. I'd like v5 to be applied to at least HEAD, as it removes a lot of unnecessary code.
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-hackers
On Tue, Nov 8, 2016 at 2:25 PM, Tsunakawa, Takayuki
<tsunakawa.takay@jp.fujitsu.com> wrote:
From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
Things are this way since b15f9b08 that introduced pgwin32_is_service().
Still, by considering what you say, you definitely have a point that if
postgres is started by another service running as Local System logs are
going where they should not. Let's remove the check for LocalSystem but
still check for SE_GROUP_ENABLED.
So, without any refactoring work, isn't the attached patch just but fine?
That seems to work properly for me.Just taking a look at the patch, I'm sure it will work.
Committer (Heikki?),
v5 is refactored for HEAD, and v6 is for previous releases without refactoring. I'd like v5 to be applied to at least HEAD, as it removes a lot of unnecessary code.
+ if (!CheckTokenMembership(NULL, AdministratorsSid, &IsAdministrators) ||
+ !CheckTokenMembership(NULL, PowerUsersSid, &IsPowerUsers))
{
- if ((EqualSid(AdministratorsSid, Groups->Groups[x].Sid) &&
- (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)) ||
- (EqualSid(PowerUsersSid, Groups->Groups[x].Sid) &&
- (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)))
- {
- success = TRUE;
- break;
- }
+ log_error("could not check access token membership: error code %lu\n",
+ GetLastError());
+ exit(1);
}
I just looked more deeply at your refactoring patch, and I didn't know
about CheckTokenMembership()... The whole logic of your patch depends
on it. That's quite a cleanup that you have here. It looks that the
former implementation just had no knowledge of this routine or it
would just have been used.+ if (IsAdministrators || IsPowerUsers)
+ return 1;
+ else
+ return 0;
I would remove the else here.
--
Michael--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
From: Michael Paquier [mailto:michael.paquier@gmail.com]
I just looked more deeply at your refactoring patch, and I didn't know about
CheckTokenMembership()... The whole logic of your patch depends on it.
That's quite a cleanup that you have here. It looks that the former
implementation just had no knowledge of this routine or it would just have
been used.
Yes, Microsoft recommends GetTokenMembership() because it's simpler.
+ if (IsAdministrators || IsPowerUsers) + return 1; + else + return 0; I would remove the else here.
IIRC, I sometimes saw this style of code in PostgreSQL (or in psqlODBC possibly...) I'd like to leave the style choice to the committer.
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-hackers
On 8 November 2016 at 14:31, Tsunakawa, Takayuki
<tsunakawa.takay@jp.fujitsu.com> wrote:
From: Michael Paquier [mailto:michael.paquier@gmail.com]
I just looked more deeply at your refactoring patch, and I didn't know about
CheckTokenMembership()... The whole logic of your patch depends on it.
That's quite a cleanup that you have here. It looks that the former
implementation just had no knowledge of this routine or it would just have
been used.Yes, Microsoft recommends GetTokenMembership() because it's simpler.
You meant CheckTokenMembership().
Relevant references:
* https://msdn.microsoft.com/en-us/library/windows/desktop/aa376389(v=vs.85).aspx
The docs say it's supported in WinXP and Win2k3, so it's fine to use.
The blog above notes that it "won't work" on Vista+, but if you read
it you'll notice that what it means is that you can't tell if the
running user has the right to elevate to Administrator rights. I don't
think PostgreSQL cares about that, it only cares if it has admin
rights *right now*, not whether the running user can gain such rights
using a UAC elevation prompt. In fact it'd be super-annoying if you
couldn't run postgres as a user with admin elevation rights so this
behaviour seems to be what we want.
The proposed patch does need to be checked with:
* WinXP, non-admin
* WinXP, admin, should refuse to run
* WinVista / Win7, local admin, UAC on => should run
* WinVista / Win7, local admin, UAC off => should refuse to run
* WinVista / Win7, run cmd.exe using "run as admin" => should refuse to run
* WinVista / Win7, not local admin => should run
--
Craig Ringer http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Training & Services
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
From: Craig Ringer [mailto:craig@2ndquadrant.com]
You meant CheckTokenMembership().
Yes, my typo in the mail.
The proposed patch does need to be checked with:
I understood you meant by "refuse to run" that postgres.exe fails to start below. Yes, I checked it on Win10. I don't have access to WinXP/2003 - Microsoft ended their support.
if (pgwin32_is_admin())
{
write_stderr("Execution of PostgreSQL by a user with administrative permissions is not\n"
"permitted.\n"
"The server must be started under an unprivileged user ID to prevent\n"
"possible system security compromises. See the documentation for\n"
"more information on how to properly start the server.\n");
exit(1);
}
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-hackers
On Tue, Nov 22, 2016 at 1:58 PM, Tsunakawa, Takayuki
<tsunakawa.takay@jp.fujitsu.com> wrote:
From: Craig Ringer [mailto:craig@2ndquadrant.com]
You meant CheckTokenMembership().
Yes, my typo in the mail.
The proposed patch does need to be checked with:
I understood you meant by "refuse to run" that postgres.exe fails to start below. Yes, I checked it on Win10. I don't have access to WinXP/2003 - Microsoft ended their support.
if (pgwin32_is_admin())
{
write_stderr("Execution of PostgreSQL by a user with administrative permissions is not\n"
"permitted.\n"
"The server must be started under an unprivileged user ID to prevent\n"
"possible system security compromises. See the documentation for\n"
"more information on how to properly start the server.\n");
exit(1);
}
I have moved that to next CF. The refactoring patch needs more testing
but the basic fix patch could be applied.
--
Michael
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
On 11/08/2016 07:56 AM, Michael Paquier wrote:
On Tue, Nov 8, 2016 at 2:25 PM, Tsunakawa, Takayuki
<tsunakawa.takay@jp.fujitsu.com> wrote:From: pgsql-hackers-owner@postgresql.org
[mailto:pgsql-hackers-owner@postgresql.org] On Behalf Of Michael Paquier
Things are this way since b15f9b08 that introduced pgwin32_is_service().
Still, by considering what you say, you definitely have a point that if
postgres is started by another service running as Local System logs are
going where they should not. Let's remove the check for LocalSystem but
still check for SE_GROUP_ENABLED.
I did some testing on patch v5, on my Windows 8 VM. I launched cmd as
Administrator, and registered the service with:
pg_ctl register -D data
I.e. without specifying a user. When I start the service with "net
start", it refuses to start, and there are no messages in the event log.
It refuses to start because "data" is not a valid directory, so that's
correct. But the error message about that is lost.
Added some debugging messages to win32_is_service(), and it confirms
that with this patch (v5), win32_is_service() incorrectly returns false,
while unmodified git master returns true, and writes the error message
to the event log.
So, I think we still need the check for Local System.
So, without any refactoring work, isn't the attached patch just but fine?
That seems to work properly for me.Just taking a look at the patch, I'm sure it will work.
Committer (Heikki?),
v5 is refactored for HEAD, and v6 is for previous releases without refactoring. I'd like v5 to be applied to at least HEAD, as it removes a lot of unnecessary code.+ if (!CheckTokenMembership(NULL, AdministratorsSid, &IsAdministrators) || + !CheckTokenMembership(NULL, PowerUsersSid, &IsPowerUsers)) { - if ((EqualSid(AdministratorsSid, Groups->Groups[x].Sid) && - (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)) || - (EqualSid(PowerUsersSid, Groups->Groups[x].Sid) && - (Groups->Groups[x].Attributes & SE_GROUP_ENABLED))) - { - success = TRUE; - break; - } + log_error("could not check access token membership: error code %lu\n", + GetLastError()); + exit(1); } I just looked more deeply at your refactoring patch, and I didn't know about CheckTokenMembership()... The whole logic of your patch depends on it. That's quite a cleanup that you have here. It looks that the former implementation just had no knowledge of this routine or it would just have been used.
Yeah, CheckTokenMembership() seems really handy. Let's switch to that,
but without removing the checks for Local System.
- Heikki
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
From: Heikki Linnakangas
So, I think we still need the check for Local System.
Thanks, fixed and confirmed that the error message is output in the
event log.
Regards
MauMau
Attachments:
win32-security-service-v7.patchapplication/octet-stream; name=win32-security-service-v7.patchDownload
diff --git a/src/port/win32security.c b/src/port/win32security.c
index 777a2e5b99..ca0fa35299 100644
--- a/src/port/win32security.c
+++ b/src/port/win32security.c
@@ -18,11 +18,6 @@
#endif
-static BOOL pgwin32_get_dynamic_tokeninfo(HANDLE token,
- TOKEN_INFORMATION_CLASS class,
- char **InfoBuffer, char *errbuf, int errsize);
-
-
/*
* Utility wrapper for frontend and backend when reporting an error
* message.
@@ -53,33 +48,11 @@ log_error(const char *fmt,...)
int
pgwin32_is_admin(void)
{
- HANDLE AccessToken;
- char *InfoBuffer = NULL;
- char errbuf[256];
- PTOKEN_GROUPS Groups;
PSID AdministratorsSid;
PSID PowerUsersSid;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
- UINT x;
- BOOL success;
-
- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
- {
- log_error(_("could not open process token: error code %lu\n"),
- GetLastError());
- exit(1);
- }
-
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenGroups,
- &InfoBuffer, errbuf, sizeof(errbuf)))
- {
- log_error("%s", errbuf);
- exit(1);
- }
-
- Groups = (PTOKEN_GROUPS) InfoBuffer;
-
- CloseHandle(AccessToken);
+ BOOL IsAdministrators;
+ BOOL IsPowerUsers;
if (!AllocateAndInitializeSid(&NtAuthority, 2,
SECURITY_BUILTIN_DOMAIN_RID,
@@ -101,32 +74,26 @@ pgwin32_is_admin(void)
exit(1);
}
- success = FALSE;
-
- for (x = 0; x < Groups->GroupCount; x++)
+ if (!CheckTokenMembership(NULL, AdministratorsSid, &IsAdministrators) ||
+ !CheckTokenMembership(NULL, PowerUsersSid, &IsPowerUsers))
{
- if ((EqualSid(AdministratorsSid, Groups->Groups[x].Sid) &&
- (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)) ||
- (EqualSid(PowerUsersSid, Groups->Groups[x].Sid) &&
- (Groups->Groups[x].Attributes & SE_GROUP_ENABLED)))
- {
- success = TRUE;
- break;
- }
+ log_error("could not check access token membership: error code %lu\n",
+ GetLastError());
+ exit(1);
}
- free(InfoBuffer);
FreeSid(AdministratorsSid);
FreeSid(PowerUsersSid);
- return success;
+
+ if (IsAdministrators || IsPowerUsers)
+ return 1;
+ else
+ return 0;
}
/*
- * We consider ourselves running as a service if one of the following is
- * true:
- *
- * 1) We are running as Local System (only used by services)
- * 2) Our token contains SECURITY_SERVICE_RID (automatically added to the
+ * We consider ourselves running as a service if
+ * our token contains SECURITY_SERVICE_RID (automatically added to the
* process token by the SCM when starting a service)
*
* Return values:
@@ -143,140 +110,62 @@ int
pgwin32_is_service(void)
{
static int _is_service = -1;
- HANDLE AccessToken;
- char *InfoBuffer = NULL;
- char errbuf[256];
- PTOKEN_GROUPS Groups;
- PTOKEN_USER User;
+ BOOL IsMember;
PSID ServiceSid;
PSID LocalSystemSid;
SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
- UINT x;
/* Only check the first time */
if (_is_service != -1)
return _is_service;
- if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
- {
- fprintf(stderr, "could not open process token: error code %lu\n",
- GetLastError());
- return -1;
- }
-
/* First check for local system */
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenUser, &InfoBuffer,
- errbuf, sizeof(errbuf)))
- {
- fprintf(stderr, "%s", errbuf);
- return -1;
- }
-
- User = (PTOKEN_USER) InfoBuffer;
-
if (!AllocateAndInitializeSid(&NtAuthority, 1,
SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0,
&LocalSystemSid))
{
fprintf(stderr, "could not get SID for local system account\n");
- CloseHandle(AccessToken);
return -1;
}
- if (EqualSid(LocalSystemSid, User->User.Sid))
+ if (!CheckTokenMembership(NULL, LocalSystemSid, &IsMember))
{
+ fprintf(stderr, "could not check access token membership: error code %lu\n",
+ GetLastError());
FreeSid(LocalSystemSid);
- free(InfoBuffer);
- CloseHandle(AccessToken);
- _is_service = 1;
- return _is_service;
+ return -1;
}
-
FreeSid(LocalSystemSid);
- free(InfoBuffer);
- /* Now check for group SID */
- if (!pgwin32_get_dynamic_tokeninfo(AccessToken, TokenGroups, &InfoBuffer,
- errbuf, sizeof(errbuf)))
+ if (IsMember)
{
- fprintf(stderr, "%s", errbuf);
- return -1;
+ _is_service = 1;
+ return _is_service;
}
- Groups = (PTOKEN_GROUPS) InfoBuffer;
-
+ /* Check for service group membership */
if (!AllocateAndInitializeSid(&NtAuthority, 1,
SECURITY_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0,
&ServiceSid))
{
- fprintf(stderr, "could not get SID for service group\n");
- free(InfoBuffer);
- CloseHandle(AccessToken);
+ fprintf(stderr, "could not get SID for service group: error code %lu\n",
+ GetLastError());
return -1;
}
- _is_service = 0;
- for (x = 0; x < Groups->GroupCount; x++)
+ if (!CheckTokenMembership(NULL, ServiceSid, &IsMember))
{
- if (EqualSid(ServiceSid, Groups->Groups[x].Sid))
- {
- _is_service = 1;
- break;
- }
+ fprintf(stderr, "could not check access token membership: error code %lu\n",
+ GetLastError());
+ FreeSid(ServiceSid);
+ return -1;
}
-
- free(InfoBuffer);
FreeSid(ServiceSid);
- CloseHandle(AccessToken);
+ if (IsMember)
+ _is_service = 1;
+ else
+ _is_service = 0;
return _is_service;
}
-
-
-/*
- * Call GetTokenInformation() on a token and return a dynamically sized
- * buffer with the information in it. This buffer must be free():d by
- * the calling function!
- */
-static BOOL
-pgwin32_get_dynamic_tokeninfo(HANDLE token, TOKEN_INFORMATION_CLASS class,
- char **InfoBuffer, char *errbuf, int errsize)
-{
- DWORD InfoBufferSize;
-
- if (GetTokenInformation(token, class, NULL, 0, &InfoBufferSize))
- {
- snprintf(errbuf, errsize,
- "could not get token information buffer size: got zero size\n");
- return FALSE;
- }
-
- if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
- {
- snprintf(errbuf, errsize,
- "could not get token information buffer size: error code %lu\n",
- GetLastError());
- return FALSE;
- }
-
- *InfoBuffer = malloc(InfoBufferSize);
- if (*InfoBuffer == NULL)
- {
- snprintf(errbuf, errsize,
- "could not allocate %d bytes for token information\n",
- (int) InfoBufferSize);
- return FALSE;
- }
-
- if (!GetTokenInformation(token, class, *InfoBuffer,
- InfoBufferSize, &InfoBufferSize))
- {
- snprintf(errbuf, errsize,
- "could not get token information: error code %lu\n",
- GetLastError());
- return FALSE;
- }
-
- return TRUE;
-}
On 03/17/2017 12:21 AM, MauMau wrote:
From: Heikki Linnakangas
So, I think we still need the check for Local System.Thanks, fixed and confirmed that the error message is output in the
event log.
Committed, thanks!
- Heikki
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers