You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/08/02 10:23:21 UTC
[camel] branch camel-3.18.x updated (b82f21457ff -> de8fe5938c5)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from b82f21457ff camel-jbang - Do not change keys in application.properties when exporting.
new 4281f681f8d Tone down logging noise
new de8fe5938c5 camel-console - Dev console for JSSE
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/support/jsse/SSLContextParameters.java | 4 +-
....java => JavaSecurityDevConsoleConfigurer.java} | 8 +-
...pache.camel.impl.console.JavaSecurityDevConsole | 2 +
.../org/apache/camel/dev-console/java-security | 2 +
.../camel/impl/console/JavaSecurityDevConsole.java | 109 +++++++++++++++++++++
5 files changed, 120 insertions(+), 5 deletions(-)
copy core/camel-console/src/generated/java/org/apache/camel/impl/console/{MemoryDevConsoleConfigurer.java => JavaSecurityDevConsoleConfigurer.java} (75%)
create mode 100644 core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.impl.console.JavaSecurityDevConsole
create mode 100644 core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/java-security
create mode 100644 core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java
[camel] 02/02: camel-console - Dev console for JSSE
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit de8fe5938c579102bfcbab7bed97d73a8dcb93e2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 2 12:14:42 2022 +0200
camel-console - Dev console for JSSE
---
.../console/JavaSecurityDevConsoleConfigurer.java | 49 +++++++++
...pache.camel.impl.console.JavaSecurityDevConsole | 2 +
.../org/apache/camel/dev-console/java-security | 2 +
.../camel/impl/console/JavaSecurityDevConsole.java | 109 +++++++++++++++++++++
4 files changed, 162 insertions(+)
diff --git a/core/camel-console/src/generated/java/org/apache/camel/impl/console/JavaSecurityDevConsoleConfigurer.java b/core/camel-console/src/generated/java/org/apache/camel/impl/console/JavaSecurityDevConsoleConfigurer.java
new file mode 100644
index 00000000000..9feb539f265
--- /dev/null
+++ b/core/camel-console/src/generated/java/org/apache/camel/impl/console/JavaSecurityDevConsoleConfigurer.java
@@ -0,0 +1,49 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.impl.console;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.util.CaseInsensitiveMap;
+import org.apache.camel.impl.console.JavaSecurityDevConsole;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+@SuppressWarnings("unchecked")
+public class JavaSecurityDevConsoleConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
+
+ @Override
+ public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
+ org.apache.camel.impl.console.JavaSecurityDevConsole target = (org.apache.camel.impl.console.JavaSecurityDevConsole) obj;
+ switch (ignoreCase ? name.toLowerCase() : name) {
+ case "camelcontext":
+ case "CamelContext": target.setCamelContext(property(camelContext, org.apache.camel.CamelContext.class, value)); return true;
+ default: return false;
+ }
+ }
+
+ @Override
+ public Class<?> getOptionType(String name, boolean ignoreCase) {
+ switch (ignoreCase ? name.toLowerCase() : name) {
+ case "camelcontext":
+ case "CamelContext": return org.apache.camel.CamelContext.class;
+ default: return null;
+ }
+ }
+
+ @Override
+ public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
+ org.apache.camel.impl.console.JavaSecurityDevConsole target = (org.apache.camel.impl.console.JavaSecurityDevConsole) obj;
+ switch (ignoreCase ? name.toLowerCase() : name) {
+ case "camelcontext":
+ case "CamelContext": return target.getCamelContext();
+ default: return null;
+ }
+ }
+}
+
diff --git a/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.impl.console.JavaSecurityDevConsole b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.impl.console.JavaSecurityDevConsole
new file mode 100644
index 00000000000..b284af54aee
--- /dev/null
+++ b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.impl.console.JavaSecurityDevConsole
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.impl.console.JavaSecurityDevConsoleConfigurer
diff --git a/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/java-security b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/java-security
new file mode 100644
index 00000000000..cf191169124
--- /dev/null
+++ b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/java-security
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.impl.console.JavaSecurityDevConsole
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java
new file mode 100644
index 00000000000..e7315f58e76
--- /dev/null
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/JavaSecurityDevConsole.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.impl.console;
+
+import java.security.Provider;
+import java.security.Security;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.camel.spi.Configurer;
+import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.util.json.JsonArray;
+import org.apache.camel.util.json.JsonObject;
+
+@DevConsole("java-security")
+@Configurer(bootstrap = true)
+public class JavaSecurityDevConsole extends AbstractDevConsole {
+
+ public JavaSecurityDevConsole() {
+ super("jvm", "java-security", "Java Security", "Displays Java Security (JSSE) information");
+ }
+
+ @Override
+ protected String doCallText(Map<String, Object> options) {
+ StringBuilder sb = new StringBuilder();
+
+ Provider[] providers = Security.getProviders();
+ if (providers != null && providers.length > 0) {
+ sb.append("Security Providers:");
+ sb.append("\n");
+ for (Provider p : providers) {
+ sb.append(String.format("\n %s (%s)\n", p.getName(), p.getVersionStr()));
+ if (p.getInfo() != null) {
+ sb.append(String.format("\n %s\n", p.getInfo()));
+ }
+ List<Provider.Service> services = p.getServices().stream()
+ .sorted(JavaSecurityDevConsole::compare)
+ .collect(Collectors.toList());
+ for (Provider.Service s : services) {
+ sb.append(String.format("\n %s: %s (%s)", s.getType(), s.getAlgorithm(), s.getClassName()));
+ }
+ sb.append("\n");
+ }
+ sb.append("\n");
+ }
+
+ return sb.toString();
+ }
+
+ @Override
+ protected JsonObject doCallJson(Map<String, Object> options) {
+ JsonObject root = new JsonObject();
+
+ Provider[] providers = Security.getProviders();
+ if (providers != null && providers.length > 0) {
+ JsonArray arr = new JsonArray();
+ root.put("securityProviders", arr);
+ for (Provider p : providers) {
+ JsonObject jo = new JsonObject();
+ arr.add(jo);
+ jo.put("name", p.getName());
+ jo.put("version", p.getVersionStr());
+ if (p.getInfo() != null) {
+ jo.put("info", p.getInfo());
+ }
+ List<Provider.Service> services = p.getServices().stream()
+ .sorted(JavaSecurityDevConsole::compare)
+ .collect(Collectors.toList());
+ if (!services.isEmpty()) {
+ JsonArray arr2 = new JsonArray();
+ jo.put("services", arr2);
+ for (Provider.Service s : services) {
+ JsonObject js = new JsonObject();
+ js.put("type", s.getType());
+ js.put("algorithm", s.getAlgorithm());
+ js.put("className", s.getClassName());
+ arr2.add(js);
+ }
+ }
+ }
+ }
+
+ return root;
+ }
+
+ private static int compare(Provider.Service o1, Provider.Service o2) {
+ int num = o1.getType().compareToIgnoreCase(o2.getType());
+ if (num == 0) {
+ num = o1.getAlgorithm().compareToIgnoreCase(o2.getAlgorithm());
+ }
+ return num;
+ }
+
+}
[camel] 01/02: Tone down logging noise
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4281f681f8d354a1b8baa05f466e15f026e4031e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 2 11:40:16 2022 +0200
Tone down logging noise
---
.../main/java/org/apache/camel/support/jsse/SSLContextParameters.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
index 8e24aad9691..60339137305 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
@@ -257,7 +257,9 @@ public class SSLContextParameters extends BaseSSLContextParameters {
LOG.trace("Creating SSLContext from SSLContextParameters [{}].", this);
- LOG.info("Available providers: {}.", Security.getProviders());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Available Security providers: {}.", Security.getProviders());
+ }
KeyManager[] keyManagers = this.keyManagers == null ? null : this.keyManagers.createKeyManagers();
TrustManager[] trustManagers = this.trustManagers == null ? null : this.trustManagers.createTrustManagers();