The branch, master-inai has been updated
via 3acbb6d354fe3421197a568004bb135c7b6612bf (commit)
from 241a6ba9de4baaa0fda547636ce29578c24ff5bd (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:
X2Go/Broker/…
[View More]ZeroConf.pm | 4 ++--
debian/changelog | 1 +
debian/x2gobroker-common.install | 3 ++-
debian/x2gobroker.pam | 2 ++
4 files changed, 7 insertions(+), 3 deletions(-)
create mode 100644 debian/x2gobroker.pam
The diff of changes is:
diff --git a/X2Go/Broker/ZeroConf.pm b/X2Go/Broker/ZeroConf.pm
index 0655191..b98f9d8 100644
--- a/X2Go/Broker/ZeroConf.pm
+++ b/X2Go/Broker/ZeroConf.pm
@@ -44,7 +44,7 @@ sub CheckAccess
# zeroconf broker: use PAM to perform authentication against
# the local PAM login module
my ($user,$pass)=@_;
- my $pam = Authen::Simple::PAM->new(service => 'login');
+ my $pam = Authen::Simple::PAM->new(service => 'x2gobroker');
if ( $pam->authenticate( $username, $password ) ) {
# successfull authentication
return 0
@@ -63,7 +63,7 @@ sub SetPass
my ($username, $oldpassword, $newpassword)=@_;
# zeroconf broker: use PAM to initiate a local passwd change
- my $service = "passwd";
+ my $service = "x2gobroker";
ref($pamh = new Authen::PAM($service, $username, \&passwd_conv_func)) ||
die "Error code $pamh during PAM init!";
$state = 0;
diff --git a/debian/changelog b/debian/changelog
index 485bd70..73dcd8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Setting up new public X2Go project: x2gobroker.
+ - Using our own PAM service ,,x2gobroker''.
* /debian/control:
+ Add an initial dependency selection to the various Depends fields.
* Fix code indentations (spaces replaced by tabs, use proper indentation
diff --git a/debian/x2gobroker-common.install b/debian/x2gobroker-common.install
index 59f3588..aaba49d 100644
--- a/debian/x2gobroker-common.install
+++ b/debian/x2gobroker-common.install
@@ -1 +1,2 @@
-cgi/x2gobroker.cgi usr/lib/cgi-bin/
\ No newline at end of file
+cgi/x2gobroker.cgi usr/lib/cgi-bin/
+x2gobroker etc/pam.d
\ No newline at end of file
diff --git a/debian/x2gobroker.pam b/debian/x2gobroker.pam
new file mode 100644
index 0000000..1eaad76
--- /dev/null
+++ b/debian/x2gobroker.pam
@@ -0,0 +1,2 @@
+@include common-auth
+@include common-passwd
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).
[View Less]
The branch, master-inai has been updated
via 71137406a700aa09ead9520e41c4a59ab3807405 (commit)
from 9cf0113b91ec37a118c8a5b1aa84d4bc285cc9d5 (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:
lib/…
[View More]x2gobroker-agent.pl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index aff2258..0e451c1 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wU
+#!/usr/bin/perl -wtU
# 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>
@@ -26,7 +26,7 @@ sub InitX2GoUser
{
my ($user, $uid, $gid, $home)=@_;
- if ( -f /etc/x2go/x2gosql/sql )
+ if ( -f "/etc/x2go/x2gosql/sql" )
{
# if we use the PostgreSQL session db backend we may have to add the
# user to the session database...
@@ -34,7 +34,7 @@ sub InitX2GoUser
my @buf = <F>;
close(F);
if ( grep (/^backend=sqlite.*/, @buf) ) {
- #if (( ! -e "$home/.x2go/sqlpass" )
+ #if ( ! -e "$home/.x2go/sqlpass" )
###
### FIXME: make the below code robust if homes are on NFS
###
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).
[View Less]
The branch, master-inai has been updated
via 1f3029121c54e02b5db037f448dfa79435702b6b (commit)
from 71137406a700aa09ead9520e41c4a59ab3807405 (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:
lib/…
[View More]x2gobroker-agent.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
The diff of changes is:
diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index 0e451c1..02b6b04 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wtU
+#!/usr/bin/perl -wU
# 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>
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).
[View Less]
The branch, master-inai has been updated
via 9cf0113b91ec37a118c8a5b1aa84d4bc285cc9d5 (commit)
from 6e7de2cf944d0e33436e6831e1b813c83d6f0e8f (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/…
[View More]x2gobroker-agent.postinst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-agent.postinst
index b811f63..95faece 100755
--- a/debian/x2gobroker-agent.postinst
+++ b/debian/x2gobroker-agent.postinst
@@ -35,7 +35,7 @@ case "$1" in
echo "Creating x2gobroker user." >&2
adduser --system --no-create-home \
--disabled-password --disabled-login \
- --shell /bin/false --group --home /var/lib/x2gobroker x2gobroker
+ --shell /bin/false --group --home /dev/null x2gobroker
else
echo "User x2gobroker already exists." >&2
fi
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).
[View Less]
The branch, master-inai has been updated
via 214487c2a586368f4811d813d7c196b293530afc (commit)
from 844c16a5ba5c1a80b0284a6c9a8ab2d0e7548a07 (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/…
[View More]control | 1 +
1 file changed, 1 insertion(+)
The diff of changes is:
diff --git a/debian/control b/debian/control
index 85c15df..c58792f 100644
--- a/debian/control
+++ b/debian/control
@@ -163,6 +163,7 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+ adduser,
x2goserver,
Description: X2Go http(s) based session broker (common files)
X2Go is a serverbased computing environment with
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).
[View Less]
The branch, master-inai has been updated
via 241a6ba9de4baaa0fda547636ce29578c24ff5bd (commit)
from 1f3029121c54e02b5db037f448dfa79435702b6b (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/…
[View More]changelog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ce356c8..485bd70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low
[ Mike Gabriel ]
- * Setting up new public X2Go project: x2gohttpbroker.
+ * Setting up new public X2Go project: x2gobroker.
* /debian/control:
+ Add an initial dependency selection to the various Depends fields.
* Fix code indentations (spaces replaced by tabs, use proper indentation
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).
[View Less]
The branch, master-inai has been updated
via 7c41ea0951e4a04f2324a7948c81d9c4e4414c29 (commit)
from 2a9d64ae0863147ded432227b13275107ba18ff2 (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/…
[View More]control | 1 +
lib/x2gobroker-ldap.pm | 6 +++---
lib/x2gobroker-zeroconf.pm | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/control b/debian/control
index 0280326..10dc11a 100644
--- a/debian/control
+++ b/debian/control
@@ -72,6 +72,7 @@ Depends:
${misc:Depends},
apache2 | httpd,
perl,
+ libnet-ldap-perl,
x2gobroker-common (>= ${source:Version}), x2gobroker-common (<< ${source:Version}.1~),
Description: X2Go http(s) session broker (simple broker)
X2Go is a serverbased computing environment with
diff --git a/lib/x2gobroker-ldap.pm b/lib/x2gobroker-ldap.pm
index 5e56c28..d05d63f 100644
--- a/lib/x2gobroker-ldap.pm
+++ b/lib/x2gobroker-ldap.pm
@@ -18,7 +18,7 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-package x2gobroker-simple;
+package x2gobroker-ldap;
use strict;
use Net::LDAP;
@@ -29,7 +29,7 @@ use Data::Dumper;
my $cfg=new Config::Simple(syntax=>'ini');
-$cfg->read("/etc/x2go/x2gobroker-simple.cfg");
+$cfg->read("/etc/x2go/x2gobroker-ldap.cfg");
my $ldapuri=$cfg->param('ldapuri');
my $replica=$cfg->param('replica');
my $binddn=$cfg->param('binddn');
@@ -40,7 +40,7 @@ our @EXPORT = ('checkAccess', 'listSessions', 'selectSession', 'setPass');
sub getBase
###
-### FIXME: provide that in /etc/x2go/x2gobroker-simple.cfg
+### FIXME: provide that in /etc/x2go/x2gobroker-ldap.cfg
### FIXME: put the pid of this process in the lock files
{
my $login=shift;
diff --git a/lib/x2gobroker-zeroconf.pm b/lib/x2gobroker-zeroconf.pm
index 5e56c28..fae529a 100644
--- a/lib/x2gobroker-zeroconf.pm
+++ b/lib/x2gobroker-zeroconf.pm
@@ -21,7 +21,6 @@
package x2gobroker-simple;
use strict;
-use Net::LDAP;
use Config::Simple;
use Crypt::SaltedHash;
use MIME::Base64;
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).
[View Less]
The branch, master-inai has been updated
via ec0343d824de168ef278dc2dfcfa258724df8b5b (commit)
from ded56322983f5e66647a0d16fa496b77017d6f92 (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/…
[View More]changelog | 2 ++
debian/control | 21 ++++++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b4e2099..22bd8c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,7 @@ x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Setting up new public X2Go project: x2gohttpbroker.
+ * /debian/control:
+ + Add an initial dependency selection to the various Depends fields.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 15 Sep 2012 17:30:24 +0200
diff --git a/debian/control b/debian/control
index 04024e5..b20d578 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,11 @@ Build-Depends:
cdbs (>= 0.4.90~),
Standards-Version: 3.9.3
-Package: x2gobroker-simple
+Package: x2gobroker-common
Architecture: all
Depends:
${misc:Depends},
-Description: X2Go http(s) session broker (simple broker)
+Description: X2Go http(s) based session broker (common files)
X2Go is a serverbased computing environment with
- session resuming
- low bandwidth support
@@ -33,15 +33,17 @@ Description: X2Go http(s) session broker (simple broker)
A session broker is most useful in load balanced
X2Go server farms.
.
- This package contains a simple example of an X2Go session
- broker.
+ This package contains common files needed by all X2Go session
+ brokers being package for this distribution.
-Package: x2gobroker-common
+Package: x2gobroker-simple
Architecture: all
Depends:
- ${perl:Depends},
${misc:Depends},
-Description: X2Go http(s) based session broker (common files)
+ apache2 | httpd,
+ perl,
+ x2gobroker-common (>= ${source:Version}), x2gobroker-common (<< ${source:Version}.1~),
+Description: X2Go http(s) session broker (simple broker)
X2Go is a serverbased computing environment with
- session resuming
- low bandwidth support
@@ -60,13 +62,14 @@ Description: X2Go http(s) based session broker (common files)
A session broker is most useful in load balanced
X2Go server farms.
.
- This package contains common files needed by all X2Go session
- brokers being package for this distribution.
+ This package contains a simple example of an X2Go session
+ broker.
Package: x2goserver-broker
Architecture: any
Depends:
${misc:Depends},
+ x2goserver,
Description: X2Go http(s) based session broker (common files)
X2Go is a serverbased computing environment with
- session resuming
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).
[View Less]
The branch, master-inai has been updated
via fbde70cbb12c5687ee3e4597a782fc25a86d8011 (commit)
from e1c3ba9271e5c7cb8223c698b14f90469906c157 (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 …
[View More] | 6 +++---
debian/control | 6 ++++--
...ver-broker.install => x2gobroker-agent.install} | 0
lib/{x2gobroker-command.pl => x2gobroker-agent.pl} | 0
src/{x2gobroker-command.c => x2gobroker-agent.c} | 10 +++++-----
5 files changed, 12 insertions(+), 10 deletions(-)
rename debian/{x2goserver-broker.install => x2gobroker-agent.install} (100%)
rename lib/{x2gobroker-command.pl => x2gobroker-agent.pl} (100%)
rename src/{x2gobroker-command.c => x2gobroker-agent.c} (87%)
The diff of changes is:
diff --git a/Makefile b/Makefile
index 058cf82..d7699c1 100755
--- a/Makefile
+++ b/Makefile
@@ -47,10 +47,10 @@ all: clean build
build: build-arch build-indep
-build-arch: build_setgidwrappers
+build-arch: build_setuidwrappers
-build_setgidwrappers:
- gcc -fPIE -pie -o lib/x2gobroker-command src/x2gobroker-command.c
+build_setuidwrappers:
+ gcc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c
build-indep:
diff --git a/debian/control b/debian/control
index b20d578..9f5cd0f 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,7 @@ Description: X2Go http(s) session broker (simple broker)
This package contains a simple example of an X2Go session
broker.
-Package: x2goserver-broker
+Package: x2gobroker-agent
Architecture: any
Depends:
${misc:Depends},
@@ -90,7 +90,9 @@ Description: X2Go http(s) based session broker (common files)
X2Go server farms.
.
This package contains a setuid backend command that
- is required by the X2Go session broker.
+ is required by the X2Go session broker. This package
+ has to be installed on all X2Go servers that shall get
+ controlled via the X2Go session broker.
.
WARNING: This package installs the setuid wrapper
/usr/lib/x2go/broker/x2gobroker-command on your system.
diff --git a/debian/x2goserver-broker.install b/debian/x2gobroker-agent.install
similarity index 100%
rename from debian/x2goserver-broker.install
rename to debian/x2gobroker-agent.install
diff --git a/lib/x2gobroker-command.pl b/lib/x2gobroker-agent.pl
similarity index 100%
rename from lib/x2gobroker-command.pl
rename to lib/x2gobroker-agent.pl
diff --git a/src/x2gobroker-command.c b/src/x2gobroker-agent.c
similarity index 87%
rename from src/x2gobroker-command.c
rename to src/x2gobroker-agent.c
index 39526cf..29992fd 100644
--- a/src/x2gobroker-command.c
+++ b/src/x2gobroker-agent.c
@@ -29,7 +29,7 @@
#include <errno.h>
int main( int argc, char *argv[] ) {
- char * x2gobrokercmdpl = NULL;
+ char * x2gobrokeragentpl = NULL;
size_t path_max;
/*
@@ -60,20 +60,20 @@ int main( int argc, char *argv[] ) {
exit(EXIT_FAILURE);
}
- // derive the full path of x2gobroker-command.pl from path of this binary
- rvap = asprintf(&x2gobrokercmdpl, "%s/%s", dirname(buffer), "x2gobroker-command.pl");
+ // derive the full path of x2gobroker-agent.pl from path of this binary
+ rvap = asprintf(&x2gobrokeragentpl, "%s/%s", dirname(buffer), "x2gobroker-agent.pl");
if(rvap == -1){
fprintf(stderr, "Failed to allocate memory calling asprintf\n");
exit(EXIT_FAILURE);
}
// execute the script, running with user-rights of this binary
- execv(x2gobrokercmdpl, argv);
+ execv(x2gobrokeragentpl, argv);
}
// ...fail
- fprintf(stderr, "Failed to execute %s: %s\n", x2gobrokercmdpl, strerror(errno));
+ fprintf(stderr, "Failed to execute %s: %s\n", x2gobrokeragentpl, strerror(errno));
return EXIT_FAILURE;
}
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).
[View Less]