author | sandman <sandman> | 2002-12-17 19:41:05 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-17 19:41:05 (UTC) |
commit | 0e05c298cc4e5a5d509286e31a3a863e78c76456 (patch) (side-by-side diff) | |
tree | 2a86553b593ff9690c14e1796c54c707f189fdf3 /core/opie-login/loginapplication.cpp | |
parent | 98f90f6ed89986485a1413c4325411e30f4c0693 (diff) | |
download | opie-0e05c298cc4e5a5d509286e31a3a863e78c76456.zip opie-0e05c298cc4e5a5d509286e31a3a863e78c76456.tar.gz opie-0e05c298cc4e5a5d509286e31a3a863e78c76456.tar.bz2 |
Opie login becomes useable now:
- pre- and post-session scripts (in $OPIEDIR/share/opie-login) to fix
things like device ownership to user/root
- logging in now doesn't simply mean: execute bin/qpe. instead opie-login
* first tries to execute ~/.opie-session
* if that doesn't exist $OPIEDIR/share/opie-login/opie-session
* if that fails too, execute $OPIEDIR/bin/qpe
you can now handle things like ssh-agent on a per-user basis.
(I'll commit the scripts later - for now it simply works like before)
Diffstat (limited to 'core/opie-login/loginapplication.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/opie-login/loginapplication.cpp | 74 |
1 files changed, 67 insertions, 7 deletions
diff --git a/core/opie-login/loginapplication.cpp b/core/opie-login/loginapplication.cpp index 8d86a71..1facf2d 100644 --- a/core/opie-login/loginapplication.cpp +++ b/core/opie-login/loginapplication.cpp @@ -32,2 +32,4 @@ #include <signal.h> +#include <sys/stat.h> +#include <sys/wait.h> @@ -160,2 +162,6 @@ bool LoginApplication::changeIdentity ( ) + // we are still root at this point - try to run the pre-session script + if ( !runRootScript ( "OPIEDIR", "share/opie-login/pre-session", s_username )) + qWarning ( "failed to run $OPIEDIR/share/opie-login/pre-session" ); + bool fail = false; @@ -179,12 +185,66 @@ bool LoginApplication::login ( ) { - char *opie = ::getenv ( "OPIEDIR" ); - char *arg = new char [::strlen ( opie ) + 8 + 1]; + execUserScript ( "HOME", ".opie-session" ); + execUserScript ( "OPIEDIR", "share/opie-login/opie-session" ); + execUserScript ( "OPIEDIR", "bin/qpe" ); - ::strcpy ( arg, opie ); - ::strcat ( arg, "/bin/qpe" ); + qWarning ( "failed to start an Opie session" ); + return false; +} - // start qpe via a login shell - ::execl ( "/bin/sh", "-sh", "-c", arg, 0 ); +void LoginApplication::logout ( ) +{ + // we are now root again - try to run the post-session script + if ( !runRootScript ( "OPIEDIR", "share/opie-login/post-session" )) + qWarning ( "failed to run $OPIEDIR/scripts/post-session" ); +} - return false; + +static char *buildarg ( const char *base, const char *script ) +{ + const char *dir = base ? ::getenv ( base ) : "/"; + char *arg = new char [::strlen ( dir ) + ::strlen ( script ) + 2]; + + ::strcpy ( arg, dir ); + ::strcat ( arg, "/" ); + ::strcat ( arg, script ); + + return arg; +} + +bool LoginApplication::runRootScript ( const char *base, const char *script, const char *param ) +{ + bool res = false; + char *arg = buildarg ( base, script ); + + struct stat st; + if (( ::stat ( arg, &st ) == 0 ) && ( st. st_uid == 0 )) { + pid_t child = ::fork ( ); + + if ( child == 0 ) { + ::execl ( "/bin/sh", "-sh", arg, param, 0 ); + ::_exit ( -1 ); + } + else if ( child > 0 ) { + int status = 0; + + while ( ::waitpid ( child, &status, 0 ) < 0 ) { } + res = ( WIFEXITED( status )) && ( WEXITSTATUS( status ) == 0 ); + } + } + + delete [] arg; + return res; +} + +void LoginApplication::execUserScript ( const char *base, const char *script ) +{ + char *arg = buildarg ( base, script ); + + struct stat st; + if ( ::stat ( arg, &st ) == 0 ) { + if ( st. st_mode & S_IXUSR ) + ::execl ( "/bin/sh", "-sh", "-c", arg, 0 ); + else + ::execl ( "/bin/sh", "-sh", arg, 0 ); + } } |