x2go-commits April 2013

x2go-commits@lists.x2go.org

2 participants
1376 discussions

lightdm-remote-session-x2go.git - build-main (branch) updated: 0160c961eb0e5a1ead77bf18d75df56aba34022a
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 0160c961eb0e5a1ead77bf18d75df56aba34022a (commit) from e2d8b821e5047519f673462b6301e8d19ad170ce (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 -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: a8f12272686ce1315017dc99a8c781d3cd3b0fe7
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via a8f12272686ce1315017dc99a8c781d3cd3b0fe7 (commit) via c30ddbd7eeb3e35732eae1055e382436524ab3a4 (commit) from 36fd7b03c684909b9b7e8c35bc378df35fc1a368 (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: freerdp-session.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/freerdp-session.in b/freerdp-session.in index 8868336..7eaead3 100755 --- a/freerdp-session.in +++ b/freerdp-session.in @@ -1,7 +1,7 @@ #!/bin/bash if [ -e ~/.freerdp-socket ]; then - @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so --no-nla -f --from-stdin + @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so -f --from-stdin else zenity --warning --text="Unable to locate FreeRDP socket" fi; hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: e2d8b821e5047519f673462b6301e8d19ad170ce
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via e2d8b821e5047519f673462b6301e8d19ad170ce (commit) from 2cbe73dc61092017ed5b09dd4d3c866cde74db07 (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: socket-sucker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/socket-sucker.c b/socket-sucker.c index 54aee32..35424a6 100644 --- a/socket-sucker.c +++ b/socket-sucker.c @@ -43,7 +43,7 @@ main (int argc, char * argv[]) serv_addr.sun_family = AF_UNIX; int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp-socket"); - if (printsize > sizeof(serv_addr.sun_path) - 1) { + if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) { return -1; } hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: cf7f4899e673b75de49c0cebf46d58f970217145
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via cf7f4899e673b75de49c0cebf46d58f970217145 (commit) from a65c4df307ace9ea82e4dcedcf542854f4e187c1 (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: Makefile.am | 13 +++++-- lightdm-remote-session-freerdp.in | 71 +++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 lightdm-remote-session-freerdp.in The diff of changes is: diff --git a/Makefile.am b/Makefile.am index bf4b300..1af5934 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,13 @@ freerdp-session: freerdp-session.in @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @chmod +x $@ +apparmordir = $(sysconfdir)/apparmor.d/ +apparmor_DATA = \ + lightdm-remote-session-freerdp + +lightdm-remote-session-freerdp: lightdm-remote-session-freerdp.in + @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + pkglibexec_PROGRAMS = \ socket-sucker socket_sucker_SOURCES = \ @@ -31,11 +38,13 @@ socket_sucker_LDFLAGS = \ EXTRA_DIST = \ $(pam_session_DATA) \ freerdp.desktop.in \ - freerdp-session.in + freerdp-session.in \ + lightdm-remote-session-freerdp.in CLEANFILES = \ freerdp.desktop \ - freerdp-session + freerdp-session \ + lightdm-remote-session-freerdp DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/lightdm-remote-session-freerdp.in b/lightdm-remote-session-freerdp.in new file mode 100644 index 0000000..38772f2 --- /dev/null +++ b/lightdm-remote-session-freerdp.in @@ -0,0 +1,71 @@ +# vim:syntax=apparmor +# Profile for restricting lightdm remote session for FreeRDP +# Based on the Guest Account Apparmor script from: +# Author: Martin Pitt <martin.pitt(a)ubuntu.com> + +#include <tunables/global> + +@pkglibexecdir@/freerdp-session-wrapper { + #include <abstractions/authentication> + #include <abstractions/nameservice> + #include <abstractions/wutmp> + /etc/compizconfig/config rw, # bug in compiz https://launchpad.net/bugs/697678 + + / r, + /bin/ rmix, + /bin/fusermount Px, + /bin/** rmix, + /cdrom/ rmix, + /cdrom/** rmix, + /dev/ r, + /dev/** rmw, # audio devices etc. + owner /dev/shm/** rmw, + /etc/ r, + /etc/** rmk, + /etc/gdm/Xsession ix, + /lib/ r, + /lib/** rmixk, + /lib32/ r, + /lib32/** rmixk, + /lib64/ r, + /lib64/** rmixk, + owner /media/ r, + owner /media/** rmwlixk, # we want access to USB sticks and the like + /opt/ r, + /opt/** rmixk, + @{PROC}/ r, + @{PROC}/* rm, + @{PROC}/asound rm, + @{PROC}/asound/** rm, + @{PROC}/ati rm, + @{PROC}/ati/** rm, + owner @{PROC}/** rm, + # needed for gnome-keyring-daemon + @{PROC}/*/status r, + /sbin/ r, + /sbin/** rmixk, + /sys/ r, + /sys/** rm, + /tmp/ rw, + owner /tmp/** rwlkmix, + /usr/ r, + /usr/** rmixk, + /var/ r, + /var/** rmixk, + /var/guest-data/** rw, # allow to store files permanently + /var/tmp/ rw, + owner /var/tmp/** rwlkm, + /{,var/}run/ r, + # necessary for writing to sockets, etc. + /{,var/}run/** rmkix, + /{,var/}run/shm/** wl, + + capability ipc_lock, + + # silence warnings for stuff that we really don't want to grant + deny capability dac_override, + deny capability dac_read_search, + #deny /etc/** w, # re-enable once LP#697678 is fixed + deny /usr/** w, + deny /var/crash/ w, +} hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: da2b0689a4caa0d04ea476f707c47950563c5b16
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated discards c30ddbd7eeb3e35732eae1055e382436524ab3a4 (commit) via da2b0689a4caa0d04ea476f707c47950563c5b16 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (c30ddbd7eeb3e35732eae1055e382436524ab3a4) \ N -- N -- N (da2b0689a4caa0d04ea476f707c47950563c5b16) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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: freerdp-session.in | 2 +- socket-sucker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/freerdp-session.in b/freerdp-session.in index 7eaead3..8868336 100755 --- a/freerdp-session.in +++ b/freerdp-session.in @@ -1,7 +1,7 @@ #!/bin/bash if [ -e ~/.freerdp-socket ]; then - @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so -f --from-stdin + @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so --no-nla -f --from-stdin else zenity --warning --text="Unable to locate FreeRDP socket" fi; diff --git a/socket-sucker.c b/socket-sucker.c index 35424a6..8e8ad25 100644 --- a/socket-sucker.c +++ b/socket-sucker.c @@ -69,7 +69,7 @@ main (int argc, char * argv[]) close(socket_fd); - if (in > 0 && out > 0) { + if (in > 0 && out > 0 && in == out) { return 0; } else { return -1; hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: a65c4df307ace9ea82e4dcedcf542854f4e187c1
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via a65c4df307ace9ea82e4dcedcf542854f4e187c1 (commit) from a8f12272686ce1315017dc99a8c781d3cd3b0fe7 (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 -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: c30ddbd7eeb3e35732eae1055e382436524ab3a4
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via c30ddbd7eeb3e35732eae1055e382436524ab3a4 (commit) from 0160c961eb0e5a1ead77bf18d75df56aba34022a (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: freerdp-session.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/freerdp-session.in b/freerdp-session.in index 8868336..7eaead3 100755 --- a/freerdp-session.in +++ b/freerdp-session.in @@ -1,7 +1,7 @@ #!/bin/bash if [ -e ~/.freerdp-socket ]; then - @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so --no-nla -f --from-stdin + @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so -f --from-stdin else zenity --warning --text="Unable to locate FreeRDP socket" fi; hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: f3909de55c99c2162ef153babed8f34269b7064a
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via f3909de55c99c2162ef153babed8f34269b7064a (commit) from cf7f4899e673b75de49c0cebf46d58f970217145 (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: Makefile.am | 10 +++++++++- freerdp-session-wrapper.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 freerdp-session-wrapper.c The diff of changes is: diff --git a/Makefile.am b/Makefile.am index 1af5934..76b9eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,9 @@ lightdm-remote-session-freerdp: lightdm-remote-session-freerdp.in @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ pkglibexec_PROGRAMS = \ - socket-sucker + socket-sucker \ + freerdp-session-wrapper + socket_sucker_SOURCES = \ socket-sucker.c socket_sucker_CFLAGS = \ @@ -35,6 +37,12 @@ socket_sucker_CFLAGS = \ socket_sucker_LDFLAGS = \ -pie +freerdp_session_wrapper_SOURCES = \ + freerdp-session-wrapper.c +freerdp_session_wrapper_CFLAGS = \ + -DPKGDATADIR="\"$(pkgdatadir)\"" \ + -Wall -Werror + EXTRA_DIST = \ $(pam_session_DATA) \ freerdp.desktop.in \ diff --git a/freerdp-session-wrapper.c b/freerdp-session-wrapper.c new file mode 100644 index 0000000..8c31fab --- /dev/null +++ b/freerdp-session-wrapper.c @@ -0,0 +1,32 @@ +/* + * Copyright © 2012 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Author: Ted Gould <ted(a)canonical.com> + */ + +#include <stdlib.h> +#include <unistd.h> + +int +main (int argc, char * argv[]) +{ + char * args[2]; + args[0] = PKGDATADIR "/freerdp-session"; + args[1] = NULL; + + execvp(args[0], args); + + return 0; +} hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: e610f6f207135dd5513a2c3120bf0ae391db2910
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via e610f6f207135dd5513a2c3120bf0ae391db2910 (commit) from 4dd6128c153ea94ea70a22a5d8a4fc50ea59ddbd (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: socket-sucker.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) The diff of changes is: diff --git a/socket-sucker.c b/socket-sucker.c index 46af2d6..0b1ee27 100644 --- a/socket-sucker.c +++ b/socket-sucker.c @@ -1,13 +1,47 @@ +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> + +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/un.h> + +#define BUFFER_SIZE 256 int main (int argc, char * argv[]) { + int socket_fd = 0; + int servlen = 0; + struct sockaddr_un serv_addr; + bzero((char *)&serv_addr, sizeof(serv_addr)); + serv_addr.sun_family = AF_UNIX; + strcpy(serv_addr.sun_path, "/home/ted/.freerdp-socket"); + servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family); + if ((socket_fd = socket(AF_UNIX, SOCK_STREAM,0)) < 0) { + return -1; + } + if (connect(socket_fd, (struct sockaddr *)&serv_addr, servlen) < 0) { + return -1; + } + char buffer[BUFFER_SIZE + 2]; + int in = 0; + int out = 0; + in = read(socket_fd, buffer, BUFFER_SIZE); + out = write(1, buffer, in); + close(socket_fd); + if (in == 0) { + return 0; + } else { + return -1; + } } + hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

lightdm-remote-session-x2go.git - build-main (branch) updated: 402133a40e196f9acb64b989e3e42039f073ba52
by git-admin＠x2go.org 27 Apr '13

27 Apr '13

The branch, build-main has been updated via 402133a40e196f9acb64b989e3e42039f073ba52 (commit) from e610f6f207135dd5513a2c3120bf0ae391db2910 (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: socket-sucker.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/socket-sucker.c b/socket-sucker.c index 0b1ee27..b5fb543 100644 --- a/socket-sucker.c +++ b/socket-sucker.c @@ -17,11 +17,16 @@ main (int argc, char * argv[]) bzero((char *)&serv_addr, sizeof(serv_addr)); + const char * home = getenv("HOME"); + if (home == NULL) { + return -1; + } + serv_addr.sun_family = AF_UNIX; - strcpy(serv_addr.sun_path, "/home/ted/.freerdp-socket"); + snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path), "%s/%s", home, ".freerdp-socket"); servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family); - if ((socket_fd = socket(AF_UNIX, SOCK_STREAM,0)) < 0) { + if ((socket_fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { return -1; } hooks/post-receive -- lightdm-remote-session-x2go.git (X2Go-based remote login session support for LightDM) 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 "lightdm-remote-session-x2go.git" (X2Go-based remote login session support for LightDM).

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
138
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2013