Merge pull request #886 from rocket-admin/fix-master-password

Fix master password: add master password to request header when it is turned on

Author: lyubov-voloshko

frontend/src/app/components/connect-db/connect-db.component.ts

@@ -68,6 +68,7 @@ export class ConnectDBComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.connectionID = this._connections.currentConnectionID;
+    this.isMasterKeyTurnedOn = this._connections.currentConnection.masterEncryption;
 
     if (this.connectionID) this.getTitleSubscription = this._connections.getCurrentConnectionTitle().subscribe(connectionTitle => {
       this.title.setTitle(`Edit connection ${connectionTitle} | Rocketadmin`);
@@ -94,7 +95,6 @@ export class ConnectDBComponent implements OnInit, OnDestroy {
   }
 
   get db():Connection {
-    this.isMasterKeyTurnedOn = this._connections.currentConnection.masterEncryption;
     return this._connections.currentConnection;
   }
 

frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css

@@ -6,6 +6,13 @@
     padding: 36px 0 16px;
 }
 
+@media (width <= 600px) {
+    .wrapper {
+        padding: 36px 9vw 16px;
+        width: 100vw;
+    }
+}
+
 .row-edit-header {
     display: flex;
     align-items: center;
@@ -17,9 +24,15 @@
     margin: 24px auto 40px;
     max-width: 520px;
     min-width: 300px;
-    width: 96%;
+    /* width: 96%; */
 }
 
+/* @media (width <= 600px) {
+    .form {
+        padding: 0 9vw;
+    }
+} */
+
 .related-views {
     position: fixed;
     top: calc(52px + 96px);

frontend/src/app/services/connections.service.ts

@@ -259,7 +259,13 @@ export class ConnectionsService {
       dbCredentials.type = `agent_${dbCredentials.type}`
     }
 
-    return this._http.post('/connection', dbCredentials)
+
+
+    return this._http.post('/connection', dbCredentials, {
+      headers: {
+        masterpwd: masterKey
+      }
+    })
     .pipe(
       map(res => {
         this._masterPassword.checkMasterPassword(connection.masterEncryption, connection.id, masterKey);
@@ -287,7 +293,11 @@ export class ConnectionsService {
       dbCredentials.type = `agent_${dbCredentials.type}`
     }
 
-    return this._http.put(`/connection/${connection.id}`, dbCredentials)
+    return this._http.put(`/connection/${connection.id}`, dbCredentials, {
+      headers: {
+        masterpwd: masterKey
+      }
+    })
     .pipe(
       map(res => {
         this._masterPassword.checkMasterPassword(connection.masterEncryption, connection.id, masterKey);

frontend/src/app/services/token.interceptor.ts

@@ -47,7 +47,7 @@ export class TokenInterceptor implements HttpInterceptor {
       withCredentials: true
     });
 
-    if (connectionID) {
+    if (connectionID && !request.headers.get('masterpwd')) {
       const masterKey = localStorage.getItem(`${connectionID}__masterKey`) || '';
       request = request.clone({
         setHeaders: {