Session handling

gsa/CMakeLists.txt

@@ -281,6 +281,7 @@ set (GSA_JS_SRC_FILES
      ${GSA_SRC_DIR}/src/web/components/link/manuallink.js
      ${GSA_SRC_DIR}/src/web/components/link/protocoldoclink.js
      ${GSA_SRC_DIR}/src/web/components/link/target.js
+     ${GSA_SRC_DIR}/src/web/components/link/userlink.js
      ${GSA_SRC_DIR}/src/web/components/menu/iconmenu.js
      ${GSA_SRC_DIR}/src/web/components/menu/menu.js
      ${GSA_SRC_DIR}/src/web/components/menu/menuentry.js
@@ -289,6 +290,7 @@ set (GSA_JS_SRC_FILES
      ${GSA_SRC_DIR}/src/web/components/notification/dialognotification.js
      ${GSA_SRC_DIR}/src/web/components/notification/withDialogNotifiaction.js
      ${GSA_SRC_DIR}/src/web/components/observer/localeobserver.js
+     ${GSA_SRC_DIR}/src/web/components/observer/sessionobserver.js
      ${GSA_SRC_DIR}/src/web/components/pagination/pagination.js
      ${GSA_SRC_DIR}/src/web/components/panel/infopanel.js
      ${GSA_SRC_DIR}/src/web/components/powerfilter/applyoverridesgroup.js

gsa/src/gmp/commands/users.js

@@ -29,13 +29,18 @@ import {forEach, map} from '../utils/array';
 import {isDefined} from '../utils/identity';
 
 import Capabilities from '../capabilities/capabilities';
+
+import moment from '../models/date';
+
 import User, {
   AUTH_METHOD_LDAP,
   AUTH_METHOD_NEW_PASSWORD,
   AUTH_METHOD_RADIUS,
 } from '../models/user';
 import Settings from '../models/settings';
 
+import {parseInt} from '../parser';
+
 import EntitiesCommand from './entities';
 import EntityCommand from './entity';
 
@@ -261,6 +266,17 @@ class UserCommand extends EntityCommand {
     });
   }
 
+  renewSession() {
+    return this.httpPost({
+      cmd: 'renew_session',
+    }).then(response => {
+      const {data} = response;
+      const {action_result} = data;
+      const seconds = parseInt(action_result.message);
+      return response.setData(moment.unix(seconds));
+    });
+  }
+
   getElementFromRoot(root) {
     return root.get_user.get_users_response.user;
   }

gsa/src/gmp/gmp.js

@@ -130,19 +130,21 @@ class Gmp {
       const {
         token,
         timezone,
-        i18n,
+        locale,
+        sessionTimeout,
       } = login;
 
       this.settings.username = username;
       this.settings.timezone = timezone;
       this.settings.token = token;
-      this.settings.locale = i18n;
+      this.settings.locale = locale;
 
       return {
-        locale: i18n === BROWSER_LANGUAGE ? undefined : i18n,
+        locale: locale === BROWSER_LANGUAGE ? undefined : locale,
         username,
         token,
         timezone,
+        sessionTimeout,
       };
     });
   }

gsa/src/gmp/models/login.js

@@ -20,19 +20,29 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+import {parseInt} from 'gmp/parser';
+
+import moment from 'gmp/models/date';
+
+import {isDefined} from 'gmp/utils/identity';
 
 class Login {
 
   constructor(elem) {
-    this.client_address = elem.client_address;
+    this.clientAddress = elem.client_address;
     this.guest = elem.guest;
-    this.i18n = elem.i18n;
+    this.locale = elem.i18n;
     this.role = elem.role;
     this.severity = elem.severity;
     this.timezone = elem.timezone;
     this.token = elem.token;
-    this.vendor_version = elem.vendor_version;
+    this.vendorVersion = elem.vendor_version;
     this.version = elem.version;
+
+    const unixSeconds = parseInt(elem.session);
+
+    this.sessionTimeout = isDefined(unixSeconds) ?
+      moment.unix(unixSeconds) : undefined;
   }
 }
 

gsa/src/gmp/utils/event.js

@@ -46,8 +46,8 @@ export const KeyCode = {
  * Group multiple sequential calls in a single one
  *
  * @param {Function} func      Function to call
- * @param {Number}   wait      Wait time until no more calls to the wrapper
- *                             function are fired
+ * @param {Number}   wait      Wait time in ms until no more calls to the
+ *                             wrapper function are fired
  * @param {Boolean}  immediate Call func initially
  *
  * @returns {Function} Wrapper function

gsa/src/web/app.js

@@ -26,7 +26,9 @@ import React from 'react';
 import {Provider as StoreProvider} from 'react-redux';
 
 import Gmp from 'gmp';
+
 import CacheFactory from 'gmp/cache';
+
 import {isDefined} from 'gmp/utils/identity';
 
 import LocaleObserver from 'web/components/observer/localeobserver';
@@ -57,8 +59,14 @@ window.gmp = gmp;
 globalcss();
 
 const initStore = () => {
-  store.dispatch(setTimezone(gmp.settings.timezone));
-  store.dispatch(setUsername(gmp.settings.username));
+  const {timezone, username} = gmp.settings;
+
+  if (isDefined(timezone)) {
+    store.dispatch(setTimezone(timezone));
+  }
+  if (isDefined(username)) {
+    store.dispatch(setUsername(username));
+  }
 };
 
 class App extends React.Component {

gsa/src/web/authorized.js

@@ -65,11 +65,13 @@ class Authorized extends React.Component {
   toLoginPage() {
     const {gmp, history} = this.props;
 
-    gmp.logout();
+    gmp.clearToken(); // ensure gmp.isLoggedIn returns false
 
     history.replace('/login', {
       next: this.props.location.pathname,
     });
+
+    gmp.logout();
   }
 
   render() {

gsa/src/web/components/bar/titlebar.js

@@ -36,12 +36,12 @@ import Divider from 'web/components/layout/divider';
 import Layout from 'web/components/layout/layout';
 
 import Link from 'web/components/link/link';
+import UserLink from 'web/components/link/userlink';
 
 import compose from 'web/utils/compose';
 import PropTypes from 'web/utils/proptypes';
 import Theme from 'web/utils/theme';
 import withGmp from 'web/utils/withGmp';
-import withUsername from 'web/utils/withUserName';
 
 const TITLE_BAR_HEIGHT = '42px';
 
@@ -53,8 +53,6 @@ const LogoutLink = styled.a`
   };
 `;
 
-const UserLink = LogoutLink.withComponent(Link);
-
 const GreenboneIcon = styled(GBIcon)`
   width: 40px;
   height: 40px;
@@ -121,12 +119,8 @@ class Titlebar extends React.Component {
     });
   }
 
-
   render() {
-    const {
-      gmp,
-      username,
-    } = this.props;
+    const {gmp} = this.props;
     return (
       <React.Fragment>
         <TitlebarPlaceholder/>
@@ -141,9 +135,7 @@ class Titlebar extends React.Component {
               </Link>
               <Divider>
                 <span>{_('Logged in as ')}</span>
-                <UserLink to="usersettings">
-                  <b>{username}</b>
-                </UserLink>
+                <UserLink/>
                 <span> | </span>
                 <LogoutLink onClick={this.handleLogout}>
                   {_('Logout')}
@@ -161,13 +153,11 @@ class Titlebar extends React.Component {
 Titlebar.propTypes = {
   gmp: PropTypes.gmp.isRequired,
   history: PropTypes.object.isRequired,
-  username: PropTypes.string,
 };
 
 export default compose(
   withGmp,
   withRouter,
-  withUsername,
 )(Titlebar);
 
 // vim: set ts=2 sw=2 tw=80:

gsa/src/web/components/dashboard/controls.js

@@ -51,6 +51,7 @@ import NewIcon from '../icon/newicon';
 import Icon from '../icon/icon';
 
 import {getDisplay} from './registry';
+import {renewSessionTimeout} from 'web/store/usersettings/actions.js';
 
 export class DashboardControls extends React.Component {
 
@@ -74,14 +75,17 @@ export class DashboardControls extends React.Component {
     } = this.props;
 
     onResetClick(dashboardId);
+    this.renewSession();
   }
 
   handleNewClick() {
     this.setState({showNewDialog: true});
+    this.renewSession();
   }
 
   handleNewDialoClose() {
     this.setState({showNewDialog: false});
+    this.renewSession();
   }
 
   handleNewDisplay({displayId}) {
@@ -92,9 +96,15 @@ export class DashboardControls extends React.Component {
 
     if (isDefined(onNewDisplay)) {
       onNewDisplay(dashboardId, displayId);
+
+      this.renewSession();
     }
   }
 
+  renewSession() {
+    this.props.renewSessionTimeout();
+  }
+
   render() {
     const {showNewDialog} = this.state;
     const {canAdd, displayIds = []} = this.props;
@@ -160,6 +170,7 @@ DashboardControls.propTypes = {
   canAdd: PropTypes.bool.isRequired,
   dashboardId: PropTypes.id.isRequired,
   displayIds: PropTypes.arrayOf(PropTypes.string),
+  renewSessionTimeout: PropTypes.func.isRequired,
   onNewDisplay: PropTypes.func.isRequired,
   onResetClick: PropTypes.func.isRequired,
 };
@@ -174,9 +185,10 @@ const mapStateToProps = (rootState, {dashboardId}) => {
   };
 };
 
-const mapDispatchToProps = (dispatch, ownProps) => ({
-  onResetClick: (...args) => dispatch(resetSettings(ownProps)(...args)),
-  onNewDisplay: (...args) => dispatch(addDisplay(ownProps)(...args)),
+const mapDispatchToProps = (dispatch, {gmp}) => ({
+  onResetClick: (...args) => dispatch(resetSettings({gmp})(...args)),
+  onNewDisplay: (...args) => dispatch(addDisplay({gmp})(...args)),
+  renewSessionTimeout: () => dispatch(renewSessionTimeout({gmp})),
 });
 
 export default compose(

gsa/src/web/components/dashboard/dashboard.js

@@ -56,6 +56,7 @@ import withGmp from '../../utils/withGmp';
 import compose from '../../utils/compose';
 
 import {getDisplay} from './registry';
+import {renewSessionTimeout} from 'web/store/usersettings/actions';
 
 const log = Logger.getLogger('web.components.dashboard');
 
@@ -108,6 +109,7 @@ export class Dashboard extends React.Component {
     maxItemsPerRow: PropTypes.number,
     maxRows: PropTypes.number,
     permittedDisplays: PropTypes.arrayOf(PropTypes.string).isRequired,
+    renewSessionTimeout: PropTypes.func.isRequired,
     saveSettings: PropTypes.func.isRequired,
     onFilterChanged: PropTypes.func,
   }
@@ -178,6 +180,7 @@ export class Dashboard extends React.Component {
     const {id} = this.props;
 
     this.props.saveSettings(id, {rows: items});
+    this.props.renewSessionTimeout();
   }
 
   render() {
@@ -265,11 +268,12 @@ const mapStateToProps = (rootState, {id}) => {
   };
 };
 
-const mapDispatchToProps = (dispatch, ownProps) => ({
+const mapDispatchToProps = (dispatch, {gmp}) => ({
   loadSettings: (id, defaults) =>
-    dispatch(loadSettings(ownProps)(id, defaults)),
+    dispatch(loadSettings({gmp})(id, defaults)),
   saveSettings: (id, settings) =>
-    dispatch(saveSettings(ownProps)(id, settings)),
+    dispatch(saveSettings({gmp})(id, settings)),
+  renewSessionTimeout: () => dispatch(renewSessionTimeout({gmp})),
 });
 
 export default compose(