Issue thelastpickle#809 : Provide a means of entering JMX credentials…

… when adding a new cluster in the UI
denniskline · Jan 15, 2020 · 117bf87 · 117bf87
1 parent 56eb04e
commit 117bf87
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 44 deletions.
diff --git a/src/server/src/main/java/io/cassandrareaper/AppContext.java b/src/server/src/main/java/io/cassandrareaper/AppContext.java
@@ -17,6 +17,7 @@
 
 package io.cassandrareaper;
 
+import io.cassandrareaper.crypto.Cryptograph;
 import io.cassandrareaper.jmx.JmxConnectionFactory;
 import io.cassandrareaper.service.RepairManager;
 import io.cassandrareaper.service.SchedulingManager;
@@ -46,6 +47,7 @@ public final class AppContext {
   public SchedulingManager schedulingManager;
   public JmxConnectionFactory jmxConnectionFactory;
   public ReaperApplicationConfiguration config;
+  public Cryptograph cryptograph;
   public MetricRegistry metricRegistry = new MetricRegistry();
   volatile String localNodeAddress = null;
 

diff --git a/src/server/src/main/java/io/cassandrareaper/ReaperApplication.java b/src/server/src/main/java/io/cassandrareaper/ReaperApplication.java
@@ -21,6 +21,7 @@
 import io.cassandrareaper.core.Cluster;
 import io.cassandrareaper.core.JmxCredentials;
 import io.cassandrareaper.core.Node;
+import io.cassandrareaper.crypto.NoopCrypotograph;
 import io.cassandrareaper.jmx.ClusterFacade;
 import io.cassandrareaper.jmx.JmxConnectionFactory;
 import io.cassandrareaper.jmx.JmxConnectionsInitializer;
@@ -162,8 +163,7 @@ public void run(ReaperApplicationConfiguration config, Environment environment)
     context.metricRegistry = environment.metrics();
     CollectorRegistry.defaultRegistry.register(new DropwizardExports(environment.metrics()));
 
-    environment
-        .admin()
+    environment.admin()
         .addServlet("prometheusMetrics", new MetricsServlet(CollectorRegistry.defaultRegistry))
         .addMapping("/prometheusMetrics");
 
@@ -172,6 +172,9 @@ public void run(ReaperApplicationConfiguration config, Environment environment)
 
     tryInitializeStorage(config, environment);
 
+    context.cryptograph = context.config == null || context.config.getCryptograph() == null
+            ? new NoopCrypotograph() : context.config.getCryptograph().create();
+
     if (context.jmxConnectionFactory == null) {
       LOG.info("no JMX connection factory given in context, creating default");
       context.jmxConnectionFactory = new JmxConnectionFactory(context);
@@ -199,8 +202,7 @@ public void run(ReaperApplicationConfiguration config, Environment environment)
       context.jmxConnectionFactory.setJmxCredentials(jmxCredentials);
     }
 
-    context.repairManager = RepairManager.create(
-        context,
+    context.repairManager = RepairManager.create(context,
         environment.lifecycle().scheduledExecutorService("RepairRunner").threads(repairThreads).build(),
         config.getHangingRepairTimeoutMins(),
         TimeUnit.MINUTES,
@@ -226,8 +228,7 @@ public void run(ReaperApplicationConfiguration config, Environment environment)
     final PingResource pingResource = new PingResource(healthCheck);
     environment.jersey().register(pingResource);
 
-    final ClusterResource addClusterResource = new ClusterResource(
-        context,
+    final ClusterResource addClusterResource = new ClusterResource(context,
         environment.lifecycle().executorService("ClusterResource").minThreads(6).maxThreads(6).build());
 
     environment.jersey().register(addClusterResource);

diff --git a/src/server/src/main/java/io/cassandrareaper/jmx/JmxConnectionFactory.java b/src/server/src/main/java/io/cassandrareaper/jmx/JmxConnectionFactory.java
@@ -23,7 +23,6 @@
 import io.cassandrareaper.core.JmxCredentials;
 import io.cassandrareaper.core.Node;
 import io.cassandrareaper.crypto.Cryptograph;
-import io.cassandrareaper.crypto.NoopCrypotograph;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -52,7 +51,6 @@ public class JmxConnectionFactory {
   private final MetricRegistry metricRegistry;
   private final HostConnectionCounters hostConnectionCounters;
   private final AppContext context;
-  private final Cryptograph cryptograph;
   private Map<String, Integer> jmxPorts;
   private JmxCredentials jmxAuth;
   private Map<String, JmxCredentials> jmxCredentials;
@@ -65,8 +63,6 @@ public JmxConnectionFactory(AppContext context) {
     hostConnectionCounters = new HostConnectionCounters(metricRegistry);
     registerConnectionsGauge();
     this.context = context;
-    this.cryptograph = context.config == null || context.config.getCryptograph() == null
-            ? new NoopCrypotograph() : context.config.getCryptograph().create();
   }
 
   private void registerConnectionsGauge() {
@@ -99,7 +95,7 @@ protected JmxProxy connectImpl(Node node) throws ReaperException, InterruptedExc
     try {
       JmxConnectionProvider provider = new JmxConnectionProvider(
               host, jmxCredentials, context.config.getJmxConnectionTimeoutInSeconds(),
-              this.metricRegistry, cryptograph);
+              this.metricRegistry, context.cryptograph);
       JMX_CONNECTIONS.computeIfAbsent(host, provider::apply);
       JmxProxy proxy = JMX_CONNECTIONS.get(host);
       if (!proxy.isConnectionAlive()) {

diff --git a/src/server/src/main/java/io/cassandrareaper/resources/ClusterResource.java b/src/server/src/main/java/io/cassandrareaper/resources/ClusterResource.java
@@ -191,7 +191,7 @@ private Response addOrUpdateCluster(
     if (jmxUsername.isPresent() && jmxPassword.isPresent()) {
       jmxCredentials = JmxCredentials.builder()
               .withUsername(jmxUsername.get())
-              .withPassword(jmxPassword.get())
+              .withPassword(context.cryptograph.encrypt(jmxPassword.get()))
               .build();
     }
 

diff --git a/src/server/src/main/java/io/cassandrareaper/resources/CryptoResource.java b/src/server/src/main/java/io/cassandrareaper/resources/CryptoResource.java
@@ -19,7 +19,6 @@
 
 import io.cassandrareaper.AppContext;
 import io.cassandrareaper.crypto.Cryptograph;
-import io.cassandrareaper.crypto.NoopCrypotograph;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -40,8 +39,7 @@ public final class CryptoResource {
   private final Cryptograph cryptograph;
 
   public CryptoResource(AppContext context) {
-    this.cryptograph = context.config == null || context.config.getCryptograph() == null
-            ? new NoopCrypotograph() : context.config.getCryptograph().create();
+    this.cryptograph = context.cryptograph;
   }
 
   @GET

diff --git a/src/server/src/test/java/io/cassandrareaper/resources/ClusterResourceTest.java b/src/server/src/test/java/io/cassandrareaper/resources/ClusterResourceTest.java
@@ -21,6 +21,7 @@
 import io.cassandrareaper.ReaperException;
 import io.cassandrareaper.core.Cluster;
 import io.cassandrareaper.core.Table;
+import io.cassandrareaper.crypto.NoopCrypotograph;
 import io.cassandrareaper.jmx.JmxConnectionFactory;
 import io.cassandrareaper.jmx.JmxProxy;
 import io.cassandrareaper.service.TestRepairConfiguration;
@@ -575,6 +576,7 @@ private MockObjects initMocks() throws ReaperException {
     AppContext context = new AppContext();
     context.storage = new MemoryStorage();
     context.config = TestRepairConfiguration.defaultConfig();
+    context.cryptograph = new NoopCrypotograph();
 
     UriInfo uriInfo = mock(UriInfo.class);
     when(uriInfo.getBaseUriBuilder()).thenReturn(UriBuilder.fromUri(SAMPLE_URI));

diff --git a/src/ui/app/jsx/cluster-form.jsx b/src/ui/app/jsx/cluster-form.jsx
@@ -25,7 +25,7 @@ const clusterForm = React.createClass({
   },
 
   getInitialState: function() {
-    return {addClusterResultMsg: null, seed_node:"", jmx_port:"7199"};
+    return {addClusterResultMsg: null, seed_node:"", jmx_port:"7199", submitEnabled: false};
   },
 
   componentWillMount: function() {
@@ -49,10 +49,31 @@ const clusterForm = React.createClass({
     const state = this.state;
     state[n] = v;
     this.replaceState(state);
-  }, 
+
+    // validate
+    this._checkValidity();
+  },
+
+  _checkValidity: function() {
+    const valid = this.state.seed_node.length > 0;
+    this.setState({submitEnabled: valid});
+  },
+
+  _toggleFormDisplay: function() {
+    if(this.state.formCollapsed == true) {
+      this.setState({formCollapsed: false});
+    }
+    else {
+      this.setState({formCollapsed: true});
+    }
+  },
 
   _onAdd: function(e) {
-    let addClusterObj = {'seed_node':this.state.seed_node, 'jmx_port':this.state.jmx_port};
+    let addClusterObj = {
+        'seed_node':this.state.seed_node,
+        'jmx_port':this.state.jmx_port,
+        'jmx_username':this.state.jmx_username,
+        'jmx_password':this.state.jmx_password};
     this.props.addClusterSubject.onNext(addClusterObj);
   },
 
@@ -63,31 +84,84 @@ const clusterForm = React.createClass({
       addMsg = <div className="alert alert-danger" role="alert">{this.state.addClusterResultMsg}</div>
     }
 
-    const form = <div className="row">
-        <div className="col-lg-12">
-
-          <div className="form-inline">
-            <div className="form-group">
-              <label htmlFor="in_seed_node">Seed node:</label>
-              <input type="text" className="form-control" ref="in_seed_node" id="in_seed_node" 
-              onChange={this._handleChange}
-              placeholder="hostname or ip"></input>
-            </div>
-            <div className="form-group">
-              <label htmlFor="in_jmx_port">JMX port:</label>
-              <input type="text" className="form-control" ref="in_jmx_port" id="in_jmx_port" 
-              onChange={this._handleChange}
-              placeholder="7199"></input>
-            </div>
-            <button type="button" className="btn btn-success" onClick={this._onAdd}>Add Cluster</button>
-          </div>
-
-      </div>
-    </div>
-
-
-    return (<div className="panel panel-default">
-              <div className="panel-body">
+     const form = <div className="row">
+         <div className="col-lg-12">
+
+           <form className="form-horizontal form-condensed">
+
+             <div className="form-group">
+               <label htmlFor="in_seed_node" className="col-sm-3 control-label">Seed node*</label>
+               <div className="col-sm-9 col-md-7 col-lg-5">
+                 <input type="text" className="form-control" ref="in_seed_node" id="in_seed_node"
+                     onChange={this._handleChange}
+                     placeholder="hostname or ip"></input>
+               </div>
+             </div>
+
+             <div className="form-group">
+               <label htmlFor="in_jmx_port" className="col-sm-3 control-label">JMX port</label>
+               <div className="col-sm-9 col-md-7 col-lg-5">
+                 <input type="text" className="form-control" ref="in_jmx_port" id="in_jmx_port"
+                     onChange={this._handleChange}
+                     placeholder="7199"></input>
+               </div>
+             </div>
+
+             <div className="form-group">
+               <label htmlFor="in_jmx_username" className="col-sm-3 control-label">JMX username</label>
+               <div className="col-sm-9 col-md-7 col-lg-5">
+                 <input type="text" className="form-control" ref="in_jmx_username" id="in_jmx_username"
+                   onChange={this._handleChange}
+                   placeholder="JMX username of cluster (optional)"></input>
+               </div>
+             </div>
+
+             <div className="form-group">
+               <label htmlFor="in_jmx_username" className="col-sm-3 control-label">JMX password</label>
+               <div className="col-sm-9 col-md-7 col-lg-5">
+                 <input type="password" className="form-control" ref="in_jmx_password" id="in_jmx_password"
+                   onChange={this._handleChange}
+                   placeholder="JMX password of cluster (optional)"></input>
+               </div>
+             </div>
+             <div className="form-group">
+               <div className="col-sm-offset-3 col-sm-9">
+                 <button type="button" className="btn btn-warning" disabled={!this.state.submitEnabled}
+                   onClick={this._onAdd}>Add Cluster</button>
+               </div>
+             </div>
+           </form>
+
+       </div>
+     </div>
+
+    let menuDownStyle = {
+      display: "inline-block"
+    }
+
+    let menuUpStyle = {
+      display: "none"
+    }
+
+    if(this.state.formCollapsed == false) {
+      menuDownStyle = {
+        display: "none"
+      }
+      menuUpStyle = {
+        display: "inline-block"
+      }
+    }
+
+    const formHeader = <div className="panel-title">
+                          <a href="#cluster-form" data-toggle="collapse" onClick={this._toggleFormDisplay}>Add Cluster
+                          &nbsp; <span className="glyphicon glyphicon-menu-down" aria-hidden="true" style={menuDownStyle}></span>
+                                 <span className="glyphicon glyphicon-menu-up" aria-hidden="true" style={menuUpStyle}></span></a></div>
+
+    return (<div className="panel panel-warning">
+              <div className="panel-heading">
+                {formHeader}
+              </div>
+              <div className="panel-body collapse" id="cluster-form">
                 {addMsg}
                 {form}
               </div>

diff --git a/src/ui/app/observable.js b/src/ui/app/observable.js
@@ -81,7 +81,10 @@ export const selectClusterSubject = new Rx.Subject();
 export const addClusterResult = addClusterSubject.map(addCluster => {
   console.info("Adding new cluster with seed node: " + addCluster.seed_node);
   return Rx.Observable.fromPromise($.ajax({
-    url: `${URL_PREFIX}/cluster?seedHost=${encodeURIComponent(addCluster.seed_node)}&jmxPort=${encodeURIComponent(addCluster.jmx_port)}`,
+    url: `${URL_PREFIX}/cluster?seedHost=${encodeURIComponent(addCluster.seed_node)}`
+            + `&jmxPort=${encodeURIComponent(addCluster.jmx_port)}`
+            + `&jmxUsername=${encodeURIComponent(addCluster.jmx_username)}`
+            + `&jmxPassword=${encodeURIComponent(addCluster.jmx_password)}`,
     method: 'POST'
   }).promise());
 }).share();