[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.0-29-ge3b8739

[X2Go dev team]

The branch, master has been updated
       via  e3b87397d75a7e246d29c4f94b1368e092f27207 (commit)
      from  512b85b24ca11d37c422d009fb3190c35d30d03e (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 e3b87397d75a7e246d29c4f94b1368e092f27207
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 12 13:23:05 2013 +0200

    Add cmdline option --broker-autologoff: Enforce re-authentication against X2Go Session Broker after a session has been suspended or terminated. (Fixes: #179).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog      |    3 +++
 man/man1/x2goclient.1 |    3 +++
 onmainwindow.cpp      |   35 +++++++++++++++++++++++------------
 onmainwindow.h        |    1 +
 4 files changed, 30 insertions(+), 12 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 84daa74..c2dcc38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
       patch was applied. Segfault only occurred if the tray icon was not used.
     - Show session name in notification bubbles.
     - Update German translation.
+    - Add cmdline option --broker-autologoff: Enforce re-authentication against
+      X2Go Session Broker after a session has been suspended or terminated.
+      (Fixes: #179).
 
   [ Ezra Bühler ]
   * New upstream version (4.0.1.1):
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index 4bbe926..9eb69ae 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -117,6 +117,9 @@ with \fI--broker-autologin\fR or \fI--broker-ssh-key\fR.
 For SSH based X2Go Session Brokers. If an SSH agent is available or default key files exist then
 try those for authentication against the X2Go Session Broker.
 .TP
+\*(T<\fB\-\-broker-autologoff\fR\*(T>
+Enforce re-authentication against X2Go Session Broker after a session has been suspended or terminated.
+.TP
 \*(T<\fB\-\-broker-ssh-key=<SSHPRIVKEY>\fR\*(T>
 For SSH based X2Go Session Brokers. Full path to a valid SSH private key file.
 .TP
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index c2fdeea..c2ee334 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -104,6 +104,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     appSeparator=0;
     config.brokerNoAuth=false;
     config.brokerAutologin=false;
+    config.brokerAutologoff=false;
     cmdAutologin=false;
 
 
@@ -5473,18 +5474,22 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
         cleanPrintSpool();
     if ( !restartResume )
     {
-        if ( !embedMode )
+        if ( brokerMode && (!config.brokerAutologoff) )
         {
-            if (!brokerMode)
-            {
-                pass->setText ( "" );
-                QTimer::singleShot ( 2000,this,
-                                     SLOT ( slotShowPassForm() ) );
-            }
-            else
-                QTimer::singleShot ( 2000,broker,
-                                     SLOT ( getUserSessions() ) );
-
+            x2goDebug<<"Re-reading user's session profiles from broker.";
+            QTimer::singleShot ( 2000,broker,
+                                 SLOT ( getUserSessions() ) );
+        }
+        else if ( brokerMode && config.brokerAutologoff )
+        {
+            x2goDebug<<"Logging off from broker as requested via cmdline.";
+            QTimer::singleShot(1, this,SLOT(slotGetBrokerAuth()));
+        }
+        else if ( !embedMode )
+        {
+            pass->setText ( "" );
+            QTimer::singleShot ( 2000,this,
+                                 SLOT ( slotShowPassForm() ) );
         }
     }
     else
@@ -6375,6 +6380,12 @@ bool ONMainWindow::parseParameter ( QString param )
         return true;
     }
 
+    if ( param == "--broker-autologoff")
+    {
+        config.brokerAutologoff=true;
+        return true;
+    }
+
     if ( param == "--broker-noauth")
     {
         config.brokerNoAuth=true;
@@ -8172,7 +8183,7 @@ void ONMainWindow::slotGpgAgentFinished ( int , QProcess::ExitStatus )
 
         x2goDebug<<"SSH-ADD out: "<<sshout;
 
-        if(brokerMode)
+        if(brokerMode && (!config.brokerAutologoff))
         {
             broker->getUserSessions();
         }
diff --git a/onmainwindow.h b/onmainwindow.h
index 86f04ec..61e730f 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -166,6 +166,7 @@ struct ConfigFile
     bool brokerAuthenticated;
     bool brokerNoAuth;
     bool brokerAutologin;
+    bool brokerAutologoff;
     QString brokerSshKey;
     QString iniFile;
     QString server;


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).