ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now checks to see if user is in group as well as owner 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3036 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2010-02-28 17:38:13 +00:00
parent 103bba682d
commit 72416fc24b
1 changed files with 148 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
src/zmfix.cpp
View File

@ -31,122 +31,174 @@
#include "zm.h" #include "zm.h"
#include "zm_db.h" #include "zm_db.h"
// Determine if we are a member of the group
int inGroup( gid_t gid )
{
// Get how many groups we are in
int n_gids = getgroups( 0, NULL );
if ( n_gids < 0 )
{
Error( "getgroups:%s", strerror(errno) );
return( -1 );
}
// Not in any groups
if ( !n_gids )
{
return( 0 );
}
// Allocate space to hold groups
gid_t *gids = new gid_t[n_gids * sizeof(gid_t)];
if ( !gids )
{
Error( "Unable to allocate groups: %s", strerror(errno) );
return( -1 );
}
// Get list of groups
if ( getgroups( n_gids, gids ) != n_gids )
{
Error( "getgroups:%s", strerror(errno) );
delete[] gids;
return( -1 );
}
// See if gid in list of groups we belong to
int in_gid = 0;
for ( int i = 0; i < n_gids; i++ )
{
if ( gids[i] == gid )
{
in_gid = 1;
}
}
delete[] gids;
return( in_gid );
}
bool fixDevice( const char *device_path ) bool fixDevice( const char *device_path )
{ {
struct stat stat_buf; struct stat stat_buf;
if ( stat( device_path, &stat_buf ) < 0 ) if ( stat( device_path, &stat_buf ) < 0 )
{ {
Error( "Can't stat %s: %s", device_path, strerror(errno)); Error( "Can't stat %s: %s", device_path, strerror(errno));
return( false ); return( false );
} }
uid_t uid = getuid(); uid_t uid = getuid();
gid_t gid = getgid(); gid_t gid = getgid();
mode_t mask = 0; int in_gid;
if ( uid == stat_buf.st_uid ) if ( (in_gid = inGroup( stat_buf.st_gid )) < 0 )
{ {
// If we are the owner return( false );
mask = 00600; }
}
else if ( gid == stat_buf.st_gid )
{
// If we are in the owner group
mask = 00060;
}
else
{
// We are neither the owner nor in the group
mask = 00006;
}
mode_t mode = stat_buf.st_mode; mode_t mask = 0;
if ( (mode & mask) == mask ) if ( uid == stat_buf.st_uid )
{ {
Debug( 1, "Permissions on %s are ok at %o", device_path, mode ); // If we are the owner
return( true ); mask = 00600;
} }
mode |= mask; else if ( gid == stat_buf.st_gid || in_gid )
{
// If we are in the owner group
mask = 00060;
}
else
{
// We are neither the owner nor in the group
mask = 00006;
}
Info( "Resetting permissions on %s to %o", device_path, mode ); mode_t mode = stat_buf.st_mode;
if ( chmod( device_path, mode ) < 0 ) if ( (mode & mask) == mask )
{ {
Error( "Can't chmod %s to %o: %s", device_path, mode, strerror(errno)); Debug( 1, "Permissions on %s are ok at %o", device_path, mode );
return( false ); return( true );
} }
return( true ); mode |= mask;
Info( "Resetting permissions on %s to %o", device_path, mode );
if ( chmod( device_path, mode ) < 0 )
{
Error( "Can't chmod %s to %o: %s", device_path, mode, strerror(errno));
return( false );
}
return( true );
} }
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
zmDbgInit( "zmfix", "", -1 ); zmDbgInit( "zmfix", "", -1 );
zmLoadConfig(); zmLoadConfig();
// Only do registered devices // Only do registered devices
static char sql[BUFSIZ]; static char sql[BUFSIZ];
snprintf( sql, sizeof(sql), "select distinct Device from Monitors where not isnull(Device) and Type = 'Local'" ); snprintf( sql, sizeof(sql), "select distinct Device from Monitors where not isnull(Device) and Type = 'Local'" );
if ( mysql_query( &dbconn, sql ) ) if ( mysql_query( &dbconn, sql ) )
{ {
Error( "Can't run query: %s", mysql_error( &dbconn ) ); Error( "Can't run query: %s", mysql_error( &dbconn ) );
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
MYSQL_RES *result = mysql_store_result( &dbconn ); MYSQL_RES *result = mysql_store_result( &dbconn );
if ( !result ) if ( !result )
{ {
Error( "Can't use query result: %s", mysql_error( &dbconn ) ); Error( "Can't use query result: %s", mysql_error( &dbconn ) );
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
{ {
fixDevice( dbrow[0] ); fixDevice( dbrow[0] );
} }
if ( mysql_errno( &dbconn ) ) if ( mysql_errno( &dbconn ) )
{ {
Error( "Can't fetch row: %s", mysql_error( &dbconn ) ); Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
// Yadda yadda // Yadda yadda
mysql_free_result( result ); mysql_free_result( result );
snprintf( sql, sizeof(sql), "select distinct ControlDevice from Monitors where not isnull(ControlDevice)" ); snprintf( sql, sizeof(sql), "select distinct ControlDevice from Monitors where not isnull(ControlDevice)" );
if ( mysql_query( &dbconn, sql ) ) if ( mysql_query( &dbconn, sql ) )
{ {
Error( "Can't run query: %s", mysql_error( &dbconn ) ); Error( "Can't run query: %s", mysql_error( &dbconn ) );
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
result = mysql_store_result( &dbconn ); result = mysql_store_result( &dbconn );
if ( !result ) if ( !result )
{ {
Error( "Can't use query result: %s", mysql_error( &dbconn ) ); Error( "Can't use query result: %s", mysql_error( &dbconn ) );
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
{ {
fixDevice( dbrow[0] ); fixDevice( dbrow[0] );
} }
if ( mysql_errno( &dbconn ) ) if ( mysql_errno( &dbconn ) )
{ {
Error( "Can't fetch row: %s", mysql_error( &dbconn ) ); Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
exit( mysql_errno( &dbconn ) ); exit( mysql_errno( &dbconn ) );
} }
// Yadda yadda // Yadda yadda
mysql_free_result( result ); mysql_free_result( result );
if ( config.opt_x10 ) if ( config.opt_x10 )
{ {
if ( config.x10_device ) if ( config.x10_device )
{ {
fixDevice( config.x10_device ); fixDevice( config.x10_device );
} }
} }
return( 0 ); return( 0 );
} }