Merge pull request elastic#334 from Tom-Artale/add-encrypt-message

Add encrypt message
harper-carroll · May 26, 2015 · b5a4c2a · b5a4c2a
2 parents 184f38c + fd9beaf
commit b5a4c2a
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/protofiles/CarpenterConfig.proto b/protofiles/CarpenterConfig.proto
@@ -1,11 +1,10 @@
 package protoMsg;
 
+import "EncryptedString.proto";
+
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "CarpenterConfigMsg";
 
-
-
-
 message CarpenterConfig {
    optional int32 minutesToRest = 1;
    optional string listTable = 3;
@@ -50,8 +49,8 @@ message CarpenterConfig {
    optional string zoneTable = 42;
    optional string zoneTableIDColumn = 43;
    optional string zoneTableItemColumn = 44;
-   optional string dbUsername = 45;
-   optional string dbPassword = 46;
+   optional EncryptedString dbUsername = 45;
+   optional EncryptedString dbPassword = 46;
    optional string emdbHost = 47;
    optional int32 sqlPagingSize = 48;
 }
diff --git a/protofiles/ConfigType.proto b/protofiles/ConfigType.proto
@@ -24,4 +24,5 @@ enum ConfigType {
    // EventManagerClientConfig = 14; Depreciated
    ColumboClientConfig = 15;
    VitalsClientConfig = 16;
+   EnigmaConfig = 17;
 }
diff --git a/protofiles/EncryptedString.proto b/protofiles/EncryptedString.proto
@@ -0,0 +1,11 @@
+package protoMsg;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "EncryptedStringMsg";
+
+
+message EncryptedString {
+  optional string encryptedString  = 1;
+}
+
+
diff --git a/protofiles/EnigmaConfig.proto b/protofiles/EnigmaConfig.proto
@@ -0,0 +1,11 @@
+package protoMsg;
+
+option java_package = "com.logrhythm.configelements";
+option java_outer_classname = "EnigmaConfigMsg";
+
+
+
+
+message EnigmaConfig {
+   optional string pathToKeys = 1;
+}
diff --git a/protofiles/InfluxConfig.proto b/protofiles/InfluxConfig.proto
@@ -1,17 +1,17 @@
 package protoMsg;
 
+import "EncryptedString.proto";
+
 option java_package = "com.logrhythm.configelements";
 option java_outer_classname = "InfluxConfigMsg";
 
 
-
-
 message InfluxConfig {
    optional string hostname = 1;
    optional int32 port = 2;
    optional string database = 3;
-   optional string adminUsername = 4;
-   optional string adminPassword = 5;
-   optional string dbUsername = 6;
-   optional string dbPassword = 7;
+   optional EncryptedString adminUsername = 4;
+   optional EncryptedString adminPassword = 5;
+   optional EncryptedString dbUsername = 6;
+   optional EncryptedString dbPassword = 7;
 }