x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

libpam-x2go.git - build-main (branch) updated: 86984a06c0841c7f973337581a9134f1cf0ad3f2
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 86984a06c0841c7f973337581a9134f1cf0ad3f2 (commit) from 453e570ea9b890eee61ef3aca99e5601cb0a0a3c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/pam-freerdp.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) The diff of changes is: diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index 259219a..edf9eca 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -1,5 +1,7 @@ #include <stdlib.h> #include <string.h> +#include <unistd.h> +#include <sys/wait.h> #include <security/pam_modules.h> #include <security/pam_modutil.h> @@ -67,6 +69,9 @@ get_item (pam_handle_t * pamh, int type) goto done; \ } +/* TODO: Make this a build thing */ +#define XFREERDP "/usr/bin/xfreerdp" + /* Authenticate. We need to make sure we have a user account, that there are remote accounts and then verify them with FreeRDP */ PAM_EXTERN int @@ -79,12 +84,59 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv) char * rdomain = NULL; int retval = PAM_IGNORE; + /* Get all the values, or prompt for them, or return with + an auth error */ GET_ITEM(username, PAM_USER); GET_ITEM(ruser, PAM_RUSER); GET_ITEM(rhost, PAM_RHOST); GET_ITEM(rdomain, PAM_TYPE_DOMAIN); GET_ITEM(password, PAM_AUTHTOK); + /* At this point we should have the values, let's check the auth */ + pid_t pid; + switch (pid = fork()) { + case 0: { /* child */ + char * args[13]; + args[0] = XFREERDP; + args[1] = "--plugin"; + args[2] = "rdpsnd.so"; + args[3] = "--no-nla"; + args[4] = "-f"; + args[5] = "--ignore-certificate"; /* TODO: Change when we set the home directory properly */ + + /* TODO: Use stdin */ + args[6] = "-u"; + args[7] = ruser; + args[8] = "-p"; + args[9] = password; + args[10] = "-d"; + args[11] = rdomain; + + args[12] = NULL; + + /* TODO: Drop privs */ + /* TODO: Home directory environment to user's home */ + execvp(args[0], args); + _exit(EXIT_FAILURE); + break; + } + case -1: { /* fork'n error! */ + retval = PAM_SYSTEM_ERR; + break; + } + default: { + int forkret = 0; + if (waitpid(pid, &forkret, 0) < 0) { + retval = PAM_SYSTEM_ERR; + } else if (forkret == 0) { + retval = PAM_SUCCESS; + } else { + retval = PAM_AUTH_ERR; + } + } + } + + /* Free Memory and return our status */ done: if (username != NULL) { free(username); } if (password != NULL) { free(password); } hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

libpam-x2go.git - build-main (branch) updated: b7e10405b3fce70267bff420466d17d1731dc0d1
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via b7e10405b3fce70267bff420466d17d1731dc0d1 (commit) from 724c72a5b24d115d5298186c05f3a2b91f64e185 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/pam-freerdp.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) The diff of changes is: diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index 539cd0d..1858baf 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -1,3 +1,5 @@ +#include <stdlib.h> + #include <security/pam_modules.h> #include <security/pam_modutil.h> @@ -6,6 +8,35 @@ PAM_EXTERN int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv) { + const char * username = NULL; + const char * password = NULL; + const char * ruser = NULL; + const char * rhost = NULL; + //const char * rdomain = NULL; + + if (pam_get_item(pamh, PAM_USER, (const void **)&username) != PAM_SUCCESS || username == NULL) { + /* If we don't have a local username then bah, we don't want + to deal with this and we're going to fail. This means that + the pam-local-account failed. + + NOTE: We're not using pam_get_user() here because we don't want + to prompt, we want to only work in the case where the username is + built for us. */ + return PAM_AUTH_ERR; + } + + if (pam_get_item(pamh, PAM_RUSER, (const void **)&ruser) != PAM_SUCCESS || ruser == NULL) { + return PAM_AUTH_ERR; + } + + if (pam_get_item(pamh, PAM_RHOST, (const void **)&rhost) != PAM_SUCCESS || rhost == NULL) { + return PAM_AUTH_ERR; + } + + if (pam_get_item(pamh, PAM_AUTHTOK, (const void **)&password) != PAM_SUCCESS || password == NULL) { + return PAM_AUTH_ERR; + } + return PAM_IGNORE; } hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

libpam-x2go.git - build-main (branch) updated: 453e570ea9b890eee61ef3aca99e5601cb0a0a3c
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 453e570ea9b890eee61ef3aca99e5601cb0a0a3c (commit) from d08f8135be6a78615cb8fe85ba6426cc319d5f9f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/pam-freerdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/src/pam-freerdp.c b/src/pam-freerdp.c index 399b84c..259219a 100644 --- a/src/pam-freerdp.c +++ b/src/pam-freerdp.c @@ -40,7 +40,7 @@ get_item (pam_handle_t * pamh, int type) message[0].msg_style = PAM_PROMPT_ECHO_OFF; break; case PAM_TYPE_DOMAIN: - message[0].msg = "remote domain:"; + message[0].msg = "domain:"; break; default: return NULL; hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

libpam-x2go.git - build-main (branch) updated: 497c3e3ff6b0055e40fa5fad3db248a48902f40a
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 497c3e3ff6b0055e40fa5fad3db248a48902f40a (commit) from 6b8fc6c1845aa0df788c37d997a7e11a7fdabba9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) The diff of changes is: diff --git a/configure.ac b/configure.ac index 05b48d1..1d3a0a1 100644 --- a/configure.ac +++ b/configure.ac @@ -7,12 +7,38 @@ AM_SILENT_RULES([yes]) AC_PROG_CC AC_PROG_LIBTOOL +########################### +# PAM +########################### + have_pam=no AC_CHECK_LIB(pam, pam_getenv, have_pam=yes) if test "x$have_pam" = "xno"; then AC_MSG_ERROR([Required library PAM was not found]) fi +########################### +# Local Install +########################### + +with_localinstall="no" +AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], + [install all files locally (for distcheck)]), + with_localinstall=$enableval, + with_localinstall=no) + +########################### +# PAM Module dir +########################### + +if test "x$with_localinstall" = "xyes"; then + PAMMODULEDIR="${libdir}/security/" +else + PAMMODULEDIR="/lib/security" +fi +AC_SUBST(PAMMODULEDIR) + + AC_CONFIG_FILES([ Makefile src/Makefile hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

libpam-x2go.git - master (branch) updated: 0.0.0.1-12-g7bd3533
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, master has been updated via 7bd353381c728a0044e61763af2972041295fb51 (commit) from 3fe57419d765633159094c1a5082ebbc284926ba (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7bd353381c728a0044e61763af2972041295fb51 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 27 13:44:37 2013 +0200 release 0.0.1.0 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7794a20..7e8dba1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libpam-x2go (0.0.1.0-0~x2go1) UNRELEASED; urgency=low +libpam-x2go (0.0.1.0-0~x2go1) unstable; urgency=low * New upstream version (0.0.1.0): - Adapt to changes in lightdm-remote-login-x2go (0.0.1.0). Expect a UCCS service that supports session type »x2go». - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 24 Apr 2013 18:30:42 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 27 Apr 2013 13:44:14 +0200 libpam-x2go (0.0.0.2-0~x2go1) unstable; urgency=low hooks/post-receive -- libpam-x2go.git (Remote login session via X2Go (PAM module)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "libpam-x2go.git" (Remote login session via X2Go (PAM module)).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.1.0-80-g9bab6a6
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 9bab6a6a97e22a86c16b5c22c4a2390a8664d3be (commit) from 3d3f78f368ac012665248ecbfa324e52d98d2d5e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a7789b2..c0ab3f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.1.2-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 23 Apr 2013 23:26:21 +0200 + x2gobroker (0.0.1.1-0~x2go1) unstable; urgency=low * New upstream version (0.0.1.1): diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 5609be3..ff47173 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.1.1' +__VERSION__ = '0.0.1.2' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index f912e33..8da3542 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.1.1' +__VERSION__ = '0.0.1.2' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.1.1-78-g8012335
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 8012335d2446cf3cf2f50a2651d7be2dd66df3a8 (commit) via 6999004a9fad84b2305fac1e92be7975802ba5ad (commit) via e5464f0dc50adbef2802e9f851ec82af31af7644 (commit) via b5a173b396f9c0d54a47b42a42c55f06580343a4 (commit) via 4728afa79980af5529f7abfbc74d146c3e41e79d (commit) via 39b86db4b2b00b42213498ea2dcb1c3bb89430c0 (commit) via f6f6b32e0a8eea06cdf1d888941e4b748ac51bb6 (commit) via 1c22ef97db768e352e9b0b6ec4bb3802f2983946 (commit) via 4922dbc886553349ce9f76fbebe4fee2ccc7dc63 (commit) via 1e70ec048687676bd15654ff60aed29f26288d75 (commit) via 692561e8fe83789863ae6a04e6e4a747f859bc03 (commit) via abc72963617a4c27b376efacbc46cfbe4de4237a (commit) via 7da7e324930cf1e2265672853609746244fa374e (commit) via 710f44fe7f9ff77d0896a250b2de52f2b4cc0a3a (commit) via 9b780d88aafa5432de58ca2c0606fe7a0048b1bc (commit) via 18a92d3014e5060b7fc959518ad822f572e89691 (commit) via 112ebe4f0f5494b18ebda527d6920aa5e1440fae (commit) via 041db4bb343d596e5861c54d80db45ab622cbf9d (commit) via e6a7f9f6dec729233e9aa9f1c9ea4978f06f14e0 (commit) via 26d9b1918943c437fbe3e88f651c66fcb2fc7443 (commit) via 1eedf8bc5e22bf396159d00c6dfd18837e29b941 (commit) via 6d488f01366743827558f8cb208b687207d19de7 (commit) via 77c3a2cea7defd21f3af1edc17f29095b3329ef3 (commit) via bc41924e2929edfe733ba6d9c9646bfeafa7e511 (commit) via d9edb503e4b28793fb7b7a3848d24bd6df97fa7f (commit) via 27257d282bf6be8bc7d511824283725df634e045 (commit) via ace673b6219a685077cc15370395190190ba94c1 (commit) via a007b3e4f9a645c500c033cf6517542d76d6ad0b (commit) via d459b5ba3c9024cdc56f3af809f364e27ae8453d (commit) via cd4bad34085b1f22461b25d3590e93b9d77961b1 (commit) via 087c7780d2eeed2810160c79da7cc3a8c62526b8 (commit) via 5d0e87dc21b65c1ddbc3b9de20d6cd9424625e1e (commit) via 5c84b2ac39cabc4f1ae3051fb220c7f65149d561 (commit) via 8cf905c4399d9737cb613acadaa1d6f6d5683f96 (commit) via 78623cec81402fea0f8e36c01fa15261cd1abba3 (commit) via 3af1d8018a7df5db02d46162b08a66cb6d6ddb11 (commit) via f4ff0ae355ed058f2fdf8e2267cb3ad7812e097c (commit) via ca48248f7042f81ec2ba9d25907e0d2545007cc6 (commit) via 620140e5cc38e3f84d014042f54c1235347c4923 (commit) via e4f4a3be711ee2246032b555da42151dfb232af8 (commit) via 0318f27362e56d6587c82d63926cfe677eaccffd (commit) via bf9ca01cd94266ee47c6ce056a702a942803124c (commit) via d6e31e806eeb92472e1eaa2c87c3bae3f5d94dc4 (commit) via ad12802c5aa0c60a2586d5874f638ef1dd7dc8e3 (commit) via 11cc12dd2fe8c0d0e171bb79e8272c7ee60528c9 (commit) via 26dd0105562fbdebc0662b8f86d78a3a8d71c2fa (commit) via ca33ea93056615c370586d9f1054b29695b56393 (commit) via 6089879c268eaafb9cd3bdc76dc9f06346ef592f (commit) via bff088d523cccbcbe5c6836eaf61e05bc2145df7 (commit) via 1298863cc62b9167f4a270cf5262d8d234fe56b0 (commit) from 2d21a9df895b5c66269e05c827bcbb5da612eb08 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: The diff of changes is: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 363a8fb21e215d403ef81c9bfc0d079d431bacce (commit) from 8012335d2446cf3cf2f50a2651d7be2dd66df3a8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c50551a..5e6f6ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gobroker (0.0.2.0-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.2.0-0~x2go1) unstable; urgency=low * New upstream version (0.0.2.0): - Add a UCCS-like web frontend UI that allows unity greeter to offer @@ -8,7 +8,7 @@ x2gobroker (0.0.2.0-0~x2go1) UNRELEASED; urgency=low Additionally the system running Unity Greeter requires the extra packages lightdm-remote-session-x2go and libpam-x2go. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 23 Apr 2013 23:26:21 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 27 Apr 2013 12:20:22 +0200 x2gobroker (0.0.1.1-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.1.0-81-g2d21a9d
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 2d21a9df895b5c66269e05c827bcbb5da612eb08 (commit) from 9bab6a6a97e22a86c16b5c22c4a2390a8664d3be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 12 +++- sbin/x2gobroker | 5 +- x2gobroker/basicauth.py | 55 +++++++++++++++++ x2gobroker/brokers/base_broker.py | 3 - x2gobroker/uccsjson.py | 26 ++++---- x2gobroker/web/uccs.py | 123 +++++++++++++++++++------------------ 6 files changed, 143 insertions(+), 81 deletions(-) create mode 100644 x2gobroker/basicauth.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c0ab3f0..c50551a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ -x2gobroker (0.0.1.2-0~x2go1) UNRELEASED; urgency=low - - * Continue development... +x2gobroker (0.0.2.0-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.0.2.0): + - Add a UCCS-like web frontend UI that allows unity greeter to offer + X2Go session logins. At the time of writing this, on the system running + Unity Greeter it requires a patched remote-login-service (see LP:1172943, + LP:1172318) and patched unity-greeter (LP:1172928, LP:1172877). + Additionally the system running Unity Greeter requires the extra packages + lightdm-remote-session-x2go and libpam-x2go. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 23 Apr 2013 23:26:21 +0200 diff --git a/sbin/x2gobroker b/sbin/x2gobroker index aff9f8d..c2ee335 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -114,10 +114,11 @@ import x2gobroker.web.extras # define the web.py URLs urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), - ('/uccs/(.*)', x2gobroker.web.uccs.X2GoBrokerWeb,), + ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,), + ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,), # ('/json/(.*)', x2gobroker.web.json.X2GoBrokerWeb,), # ('/html/(.*)', x2gobroker.web.html.X2GoBrokerWeb,), - ('/pubkeys(|/)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), + ('/pubkeys(/*)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), ) settings = { diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py new file mode 100644 index 0000000..f48da4c --- /dev/null +++ b/x2gobroker/basicauth.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python + +# This file is part of the X2Go Project - http://www.x2go.org +# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +# modules +import base64 + +def require_basic_auth(realm, validate_callback): + def require_basic_auth_decorator(handler_class): + def wrap_execute(handler_execute): + def require_basic_auth(handler, kwargs): + def create_auth_header(): + handler.set_status(401) + handler.set_header('WWW-Authenticate', 'Basic realm="{realm}"'.format(realm=realm)) + handler._transforms = [] + handler.finish() + + auth_header = handler.request.headers.get('Authorization') + if auth_header is None or not auth_header.startswith('Basic '): + create_auth_header() + else: + auth_decoded = base64.decodestring(auth_header[6:]) + username, kwargs['basicauth_pass'] = [ unicode(s) for s in auth_decoded.split(':', 2) ] + kwargs['basicauth_user'], access = validate_callback(username, kwargs['basicauth_pass']) + if access: + return True + else: + create_auth_header() + def _execute(self, transforms, *args, **kwargs): + if not require_basic_auth(self, kwargs): + return False + return handler_execute(self, transforms, *args, **kwargs) + return _execute + + handler_class._execute = wrap_execute(handler_class._execute) + return handler_class + return require_basic_auth_decorator diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 3cac792..2ce0ba4 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -731,9 +731,6 @@ class X2GoBroker(object): access = False access = self._do_authenticate(username=username, password=password) - if not access and "@" in username: - _username = username.split('@')[0] - access = self._do_authenticate(username=_username, password=password) logger_broker.debug('base_broker.X2GoBroker.check_access(): result of authentication check is: {access}'.format(access=access)) ### HANDLING OF DYNAMIC AUTHENTICATION ID HASHES diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index ca61dab..8393a59 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> @@ -59,7 +61,7 @@ class ManagementServer(): """ if isinstance(ts_name, str): self.DefaultServer = unicode(ts_name) - elif isinstance(domain, unicode): + elif isinstance(ts_name, unicode): self.DefaultServer = ts_name else: raise TypeError("set_default expects a string argument") @@ -87,7 +89,7 @@ class ManagementServer(): Dump this instance as JSON object. """ - return json.dumps(self, default=convert_to_builtin_type, sort_keys=True, indent=4) + return json.dumps(self, default=convert_to_builtin_type, sort_keys=True, indent=2) # NOT USED!!! @@ -102,7 +104,7 @@ class RDPServer(): Instantiate a UCCS compatible RDP server session profile object. """ - def __init__(self, host, name, username=None, password=None): + def __init__(self, host, name, username='', password=''): """\ @param host: hostname of RDP server host @type host: C{unicode} @@ -114,9 +116,9 @@ class RDPServer(): @type password: C{unicode} """ - self.URL = unicode(host) + self.URL = 'http://{url}/'.format(url=unicode(host)) self.Name = unicode(name) - self.Protocol = u'freerdp' + self.Protocol = u'rdp' self.DomainRequired = True self.Username = unicode(username) self.Password = unicode(password) @@ -143,7 +145,7 @@ class RDPServer(): Dump this instance as JSON object. """ - return json.dumps(self, default=convert_to_builtin_type, sort_keys=True, indent=4) + return json.dumps(self, default=convert_to_builtin_type, sort_keys=True, indent=2) class ICAServer(): @@ -151,7 +153,7 @@ class ICAServer(): Instantiate a UCCS compatible ICA server session profile object. """ - def __init__(self, host, name, username=None, password=None): + def __init__(self, host, name, username='', password=''): """\ @param host: hostname of ICA server host @type host: C{unicode} @@ -163,7 +165,7 @@ class ICAServer(): @type password: C{unicode} """ - self.URL = unicode(host) + self.URL = 'http://{url}/'.format(url=unicode(host)) self.Name = unicode(name) self.Protocol = u'ica' self.DomainRequired = unicode(True) @@ -192,7 +194,7 @@ class ICAServer(): Dump this instance as JSON object. """ - return json.dumps(self, default=convert_to_builtin_type, sort_keys=True, indent=4) + return json.dumps(self, default=convert_to_builtin_type, sort_keys=True, indent=2) class X2GoServer(): @@ -200,7 +202,7 @@ class X2GoServer(): Instantiate a UCCS compatible X2Go Server session profile object. """ - def __init__(self, host, name, username=None, password=None): + def __init__(self, host, name, username='', password=''): """\ @param host: hostname of X2Go Server host @type host: C{unicode} @@ -212,7 +214,7 @@ class X2GoServer(): @type password: C{unicode} """ - self.URL = unicode(host) + self.URL = 'http://{url}/'.format(url=unicode(host)) self.Name = unicode(name) self.Protocol = u'x2go' self.SessionTypeRequired = True @@ -241,5 +243,5 @@ class X2GoServer(): Dump this instance as JSON object. """ - return json.dumps(self, default=convert_to_builtin_type, sort_keys=True, indent=4) + return json.dumps(self, default=convert_to_builtin_type, sort_keys=True, indent=2) diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index db59f24..041ea81 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -21,59 +21,50 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # modules -import types import re import base64 +import datetime import tornado.web -from tornado.escape import native_str, parse_qs_bytes # Python X2Go Broker modules import x2gobroker.defaults from x2gobroker.loggers import logger_broker, logger_error import x2gobroker.uccsjson +import x2gobroker.basicauth + + +def credentials_validate(username, password): -def require_basic_auth(realm, validate_callback): - def require_basic_auth_decorator(handler_class): - def wrap_execute(handler_execute): - def require_basic_auth(handler, kwargs): - def create_auth_header(): - handler.set_status(401) - handler.set_header('WWW-Authenticate', 'Basic realm="{realm}"'.format(realm=realm)) - handler._transforms = [] - handler.finish() - - auth_header = handler.request.headers.get('Authorization') - if auth_header is None or not auth_header.startswith('Basic '): - create_auth_header() - else: - auth_decoded = base64.decodestring(auth_header[6:]) - kwargs['basicauth_user'], kwargs['basicauth_pass'] = [ unicode(s) for s in auth_decoded.split(':', 2) ] - if validate_callback(handler_class, kwargs['basicauth_user'], kwargs['basicauth_pass']): - return True - else: - create_auth_header() - def _execute(self, transforms, *args, **kwargs): - if not require_basic_auth(self, kwargs): - return False - return handler_execute(self, transforms, *args, **kwargs) - return _execute - - handler_class._execute = wrap_execute(handler_class._execute) - return handler_class - return require_basic_auth_decorator - - -def credentials_validate(handler_class, username, password): import x2gobroker.brokers.base_broker # FIXME: with the below hack, the backend broker detection in X2GoBrokerWeb is disabled, only global options # from x2gobroker.conf are available here... - return x2gobroker.brokers.base_broker.X2GoBroker().check_access(username=username, password=password) + broker = x2gobroker.brokers.base_broker.X2GoBroker() + broker.enable() + access = broker.check_access(username=username, password=password) + # UCCS only allows email addresses for remote login + if not access and "@" in username: + username = username.split('@')[0] + access = broker.check_access(username=username, password=password) + return username, access -@require_basic_auth('Authentication required', credentials_validate) class X2GoBrokerWeb(tornado.web.RequestHandler): + def get(self, path): + if x2gobroker.defaults.X2GOBROKER_DEBUG: + logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG') + return self.head(path) + raise tornado.web.HTTPError(405) + + def head(self, path): + self.write(unicode(datetime.datetime.utcnow())) + return + + +(a)x2gobroker.basicauth.require_basic_auth('Authentication required', credentials_validate) +class X2GoBrokerWebAPI(tornado.web.RequestHandler): + http_header_items = { 'Content-Type': 'text/plain; charset=utf-8', 'Expires': '+1h', @@ -84,30 +75,26 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): for http_header_item in self.http_header_items.keys(): self.set_header(http_header_item, self.http_header_items[http_header_item]) - def get(self, backend, basicauth_user, basicauth_pass): - if x2gobroker.defaults.X2GOBROKER_DEBUG: - self._gen_http_header() - logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG') - return self.head(backend, basicauth_user, basicauth_pass) - raise tornado.web.HTTPError(404) + def get(self, *args, **kwargs): + + self._gen_http_header() - def head(self, backend, basicauth_user, basicauth_pass): + backend = args[0] + api_version = args[1] + try: + api_version = int(api_version) + except TypeError: + api_version = 4 if not backend: - backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND + self.backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND else: - backend = backend.rstrip('/') - - api_version = 4 - if re.match('.*/api/[0-9].*', backend): - # get the first and the third item as backend, api_version - backend, api_version = backend.split('/')[:3:2] - api_version = int(api_version) + self.backend = backend.rstrip('/') try: # dynamically detect broker backend from given URL - exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend)) - exec("self.broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) + exec("import x2gobroker.brokers.{backend}_broker".format(backend=self.backend)) + exec("self.broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=self.backend)) except ImportError: # throw a 404 if the backend does not exist raise tornado.web.HTTPError(404) @@ -121,27 +108,34 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): # set the client address for the broker backend ip = self.request.remote_ip if ip: - logger_broker.info('client address is {address}'.format(address=ip)) self.broker_backend.set_client_address(ip) + logger_broker.info('client address is {address}'.format(address=ip)) elif not x2gobroker.defaults.X2GOBROKER_DEBUG: # if the client IP is not set, we pretend to have nothing on offer logger_error.error('client could not provide an IP address, pretending: 404 Not Found') raise tornado.web.HTTPError(404) - username, password = basicauth_user, basicauth_pass - cookie = '' + ### + ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST + ### - output = '' + try: + username = kwargs['basicauth_user'] + except KeyError: + raise tornado.web.HTTPError(401) + cookie = '' logger_broker.debug ('Authenticated as username: {username}, with password: <hidden>'.format(username=username)) ### - ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST + ### GENERATE UCCS JSON TREE ### + output = '' + profiles = self.broker_backend.list_profiles(username) urlbase = self.broker_backend.get_global_value('my-uccs-url-base').rstrip('/') - ms = x2gobroker.uccsjson.ManagementServer('{urlbase}/uccs/{backend}'.format(urlbase=urlbase, backend=backend), 'X2Go Session Broker') + ms = x2gobroker.uccsjson.ManagementServer('{urlbase}/uccs/{backend}/'.format(urlbase=urlbase, backend=backend), 'X2Go Session Broker') profile_ids = profiles.keys() profile_ids.sort() @@ -149,14 +143,21 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): for profile_id in profile_ids: if profiles[profile_id][u'directrdp']: - pass + ts = x2gobroker.uccsjson.RDPServer( + host='{hostname}'.format(hostname=profiles[profile_id][u'host'][0]), + name=profiles[profile_id][u'name'], + username=profiles[profile_id][u'user'], + ) + ts.set_domain('LOCAL') else: ts = x2gobroker.uccsjson.X2GoServer( - host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'], port=profiles[profile_id][u'sshport']), + host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'][0], port=profiles[profile_id][u'sshport']), name=profiles[profile_id][u'name'], username=profiles[profile_id][u'user'], ) + ts.set_session_type(profiles[profile_id]['command']) ms.add_terminalserver(ts) + ms.set_default(ts.Name) output += ms.toJson() hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.1.0-75-ga53f3b6
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via a53f3b66d7f514295bd071871211ec82ad4d1147 (commit) from cd6780f54b5ad4df8e3d83d7ecdfaca58d78cfdd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/uccsjson.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index efbbc32..ca61dab 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -46,8 +46,8 @@ class ManagementServer(): """ self.RemoteDesktopServers = [] self.AdditionalManagementServers = [] - self.URL = url - self.Name = name + self.URL = unicode(url) + self.Name = unicode(name) def set_default(self, ts_name): """\ @@ -57,8 +57,10 @@ class ManagementServer(): @type ts_name: C{unicode} """ - if isinstance(tsName, str): - self.DefaultServer = tsName + if isinstance(ts_name, str): + self.DefaultServer = unicode(ts_name) + elif isinstance(domain, unicode): + self.DefaultServer = ts_name else: raise TypeError("set_default expects a string argument") @@ -115,7 +117,7 @@ class RDPServer(): self.URL = unicode(host) self.Name = unicode(name) self.Protocol = u'freerdp' - self.DomainRequired = unicode(True) + self.DomainRequired = True self.Username = unicode(username) self.Password = unicode(password) @@ -228,6 +230,8 @@ class X2GoServer(): """ if isinstance(session_type, str): + self.SessionType = unicode(session_type) + elif isinstance(session_type, unicode): self.SessionType = session_type else: raise TypeError("set_session_type() expects a string or unicode argument") hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits