diff --git a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
index b2162e00b7..8d9cedccb8 100644
--- a/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
+++ b/src/frontend/packages/core/src/shared/components/ssh-viewer/ssh-viewer.component.ts
@@ -29,6 +29,8 @@ export class SshViewerComponent implements OnInit, OnDestroy {
public isConnecting = false;
private isDestroying = false;
+ public message = '';
+
@ViewChild('terminal', { static: true }) container: ElementRef;
private xterm: Terminal;
@@ -66,7 +68,6 @@ export class SshViewerComponent implements OnInit, OnDestroy {
this.xterm = new Terminal();
this.xterm.loadAddon(this.xtermFitAddon);
this.xterm.open(this.container.nativeElement);
- // this.xtermFitAddon.fit();
this.resize();
this.xterm.onKey(e => {
@@ -115,8 +116,15 @@ export class SshViewerComponent implements OnInit, OnDestroy {
this.msgSubscription = this.sshStream
.subscribe(
(data: string) => {
- for (const c of data.split(' ')) {
- this.xterm.write(String.fromCharCode(parseInt(c, 16)));
+ // Check for a window title message
+ if (!this.isWindowTitle(data)) {
+ for (const c of data.split(' ')) {
+ this.xterm.write(String.fromCharCode(parseInt(c, 16)));
+ }
+ } else {
+ console.log('Error')
+ const eMsg = this.errorMessage;
+ this.errorMessage = eMsg;
}
},
(err) => {
@@ -130,4 +138,24 @@ export class SshViewerComponent implements OnInit, OnDestroy {
}
);
}
+ private isWindowTitle(data: string): boolean {
+ const chars = data.split(' ');
+ if (chars.length > 4 &&
+ parseInt(chars[0], 16) === 27 &&
+ parseInt(chars[1], 16) === 93 &&
+ parseInt(chars[2], 16) === 50 &&
+ parseInt(chars[3], 16) === 59) {
+ let title = '';
+ for (let i = 4; i < chars.length - 1; i++) {
+ title += String.fromCharCode(parseInt(chars[i], 16));
+ }
+ if (title.length > 0 && title.charAt(0) === '!') {
+ this.errorMessage = title.substr(1);
+ console.log(this.errorMessage);
+ return true;
+ }
+ this.message = title;
+ }
+ return false;
+ }
}
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 60241f3d73..e5915d0af6 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -54,6 +54,7 @@ import {
TableCellSidePanelComponent,
} from './components/list/list-table/table-cell-side-panel/table-cell-side-panel.component';
import { TableCellStatusDirective } from './components/list/list-table/table-cell-status.directive';
+import { listTableCells } from './components/list/list-table/table-cell/table-cell.component';
import { TableComponent } from './components/list/list-table/table.component';
import { listTableComponents } from './components/list/list-table/table.types';
import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
@@ -310,7 +311,8 @@ import { UserPermissionDirective } from './user-permission.directive';
SidepanelPreviewComponent,
TableCellEndpointNameComponent,
CardProgressOverlayComponent,
- MaxListMessageComponent
+ MaxListMessageComponent,
+ ...listTableCells
],
providers: [
ListConfig,
diff --git a/src/frontend/packages/devkit/src/build/extensions.ts b/src/frontend/packages/devkit/src/build/extensions.ts
index 93c42193f1..cbd7d43090 100644
--- a/src/frontend/packages/devkit/src/build/extensions.ts
+++ b/src/frontend/packages/devkit/src/build/extensions.ts
@@ -17,7 +17,7 @@ const importModuleRegex = /src\/frontend\/packages\/core\/src\/custom-import.mod
export class ExtensionsHandler {
- constructor() {}
+ constructor() { }
// Write out the _custom-import.module.ts file importing all of the required extensions
public apply(webpackConfig: any, config: StratosConfig, options: any) {
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
index 21ec6ec6e0..fa574a1754 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
@@ -68,6 +68,7 @@ export interface IStratosBaseEntityDefinition
[];
readonly paginationConfig?: PaginationPageIteratorConfig;
readonly tableConfig?: EntityTableConfig;
+ readonly registrationComponent?: any;
/**
* Hook that will fire before an entity is emitted by an entity service. This could be used, for example, entity validation
*/
diff --git a/src/frontend/packages/store/src/jetstream.ts b/src/frontend/packages/store/src/jetstream.ts
index 12477fabba..fb8cb84451 100644
--- a/src/frontend/packages/store/src/jetstream.ts
+++ b/src/frontend/packages/store/src/jetstream.ts
@@ -67,7 +67,7 @@ export function hasJetStreamError(pages: Partial[]): Jet
}) as JetStreamErrorResponse;
}
-function isJetstreamError(err: any): JetStreamErrorResponse {
+export function isJetstreamError(err: any): JetStreamErrorResponse {
return !!(
err &&
err.error &&
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
index b62fee8a48..1a3826a515 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts
@@ -26,8 +26,8 @@ export function failRequest(state, action: IFailedRequestAction) {
busy: false,
deleted: false,
error: true,
+ message: action.message
};
- requestFailedState.message = action.message;
} else {
requestFailedState.fetching = false;
requestFailedState.error = true;
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
index 8b514a0c4a..0f1b724a3e 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/types.ts
@@ -14,6 +14,14 @@ export interface ActionState {
message: string;
}
+// Status of an action
+export interface ActionStatus {
+ busy: boolean;
+ error: boolean;
+ message?: string;
+ completed: boolean;
+}
+
/**
* Multi action lists can have different entity types per page
* We use schemaKey to track this type
diff --git a/src/frontend/packages/store/src/selectors/api.selectors.ts b/src/frontend/packages/store/src/selectors/api.selectors.ts
index ed793c7678..b1eaa34938 100644
--- a/src/frontend/packages/store/src/selectors/api.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/api.selectors.ts
@@ -31,7 +31,7 @@ export const getEntityUpdateSections = (
export const getUpdateSectionById = (guid: string) => (
updating
): ActionState => {
- return updating[guid];
+ return updating ? updating[guid] : null;
};
export function selectUpdateInfo(
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index a77a92e217..9f64ad9b11 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -14,7 +14,7 @@ export const endpointStatusSelector = (state: InternalAppState): EndpointState =
const endpointEntityKey = EntityCatalogHelpers.buildEntityKey(endpointEntityType, STRATOS_ENDPOINT_TYPE);
export const endpointEntitiesSelector = selectEntities(endpointEntityKey);
-const endpointOfType = (type: string) =>
+export const endpointOfType = (type: string) =>
(endpoints: IRequestEntityTypeState): IRequestEntityTypeState => {
return Object.values(endpoints || {}).reduce((endpointsOfType, endpoint) => {
if (endpoint.cnsi_type === type) {
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 9b649da31d..f6f90c60c6 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -10,6 +10,7 @@ import (
"fmt"
"io"
"io/ioutil"
+ "math/rand"
"net"
"net/http"
"os"
@@ -115,6 +116,8 @@ func main() {
}
}
+ rand.Seed(time.Now().UnixNano())
+
log.SetOutput(os.Stdout)
log.Info("========================================")
diff --git a/src/jetstream/repository/interfaces/sessiondata.go b/src/jetstream/repository/interfaces/sessiondata.go
index 4128f4280f..37884b576a 100644
--- a/src/jetstream/repository/interfaces/sessiondata.go
+++ b/src/jetstream/repository/interfaces/sessiondata.go
@@ -10,9 +10,13 @@ type SessionDataStore interface {
SetValues(session, group string, values map[string]string, autoExpire bool) error
DeleteValues(session, group string) error
+ IsValidSession(id int) (bool, error)
+
// Cleanup runs a background goroutine every interval that deletes expired sessions from the database
Cleanup(interval time.Duration) (chan<- struct{}, <-chan struct{})
// StopCleanup stops the background cleanup from running
StopCleanup(quit chan<- struct{}, done <-chan struct{})
+
+
}
diff --git a/src/jetstream/repository/sessiondata/psql_sessiondata.go b/src/jetstream/repository/sessiondata/psql_sessiondata.go
index d0c3e7c1a0..c60ad32b63 100644
--- a/src/jetstream/repository/sessiondata/psql_sessiondata.go
+++ b/src/jetstream/repository/sessiondata/psql_sessiondata.go
@@ -3,6 +3,8 @@ package sessiondata
import (
"database/sql"
"fmt"
+ "strconv"
+ "time"
log "github.com/sirupsen/logrus"
@@ -16,12 +18,15 @@ var insertSessionDataValue = `INSERT INTO session_data (session, groupName, name
var deleteSessionGroupData = `DELETE FROM session_data WHERE session=$1 AND groupName=$2`
-// Expire data for sessions that not longer exist
+// Expire data for sessions that no longer exist
var expireSessionData = `UPDATE session_data SET expired=true WHERE session NOT IN (SELECT id from sessions)`
// Delete data for sessions that no longer exist
var deleteSessionData = `DELETE FROM session_data WHERE expired=true AND keep_on_expire=false`
+// Check if a session valid
+var isValidSession = `SELECT id, expires_on from sessions WHERE id=$1`
+
// SessionDataRepository is a RDB-backed Session Data repository
type SessionDataRepository struct {
db *sql.DB
@@ -40,6 +45,7 @@ func InitRepositoryProvider(databaseProvider string) {
deleteSessionGroupData = datastore.ModifySQLStatement(deleteSessionGroupData, databaseProvider)
expireSessionData = datastore.ModifySQLStatement(expireSessionData, databaseProvider)
deleteSessionData = datastore.ModifySQLStatement(deleteSessionData, databaseProvider)
+ isValidSession = datastore.ModifySQLStatement(isValidSession, databaseProvider)
}
// GetValues returns all values from the config table as a map
@@ -100,3 +106,27 @@ func (c *SessionDataRepository) SetValues(session, group string, values map[stri
return nil
}
+
+// IsValidSession - Determines if the given session ID is still valid (has not expired)
+func (c *SessionDataRepository) IsValidSession(session int) (bool, error) {
+ var (
+ id string
+ expiry time.Time
+ )
+
+ err := c.db.QueryRow(isValidSession, strconv.Itoa(session)).Scan(&id, &expiry)
+
+ switch {
+ case err == sql.ErrNoRows:
+ // No record with this ID - session does not exist
+ return false, nil
+ case err != nil:
+ return false, fmt.Errorf("Error trying to find Session record: %v", err)
+ default:
+ // do nothing
+ }
+
+ // Check if the session has expired
+ now := time.Now()
+ return expiry.After(now), nil
+}
diff --git a/src/test-e2e/endpoints/register-dialog.po.ts b/src/test-e2e/endpoints/register-dialog.po.ts
index 30e52790e7..44423a0d97 100644
--- a/src/test-e2e/endpoints/register-dialog.po.ts
+++ b/src/test-e2e/endpoints/register-dialog.po.ts
@@ -18,7 +18,7 @@ export class RegisterStepper extends Page {
}
isRegisterDialog(): promise.Promise {
- return this.header.getTitleText().then(title => title === 'Register a new Endpoint');
+ return this.header.getTitleText().then(title => title === 'Register Endpoint');
}
getName = () => this.form.getFormField('name');