[
https://issues.apache.org/jira/browse/KARAF-5263?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16713208#comment-16713208
]
ASF GitHub Bot commented on KARAF-5263:
---------------------------------------
jbonofre closed pull request #687: [KARAF-5263] Cleanup references to removed
karaf.admin.role property
URL: https://github.com/apache/karaf/pull/687
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
index 1e3cef1961..b5e9a0fa49 100644
---
a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
+++
b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
@@ -45,7 +45,6 @@ hostKey = ${karaf.etc}/host.key
#
# Role name used for SSH access authorization
-# If not set, this defaults to the ${karaf.admin.role} configured in
etc/system.properties
#
# sshRole = admin
diff --git a/itests/test/src/test/filtered-resources/etc/feature.xml
b/itests/test/src/test/filtered-resources/etc/feature.xml
index 1f8a485114..3354723f1b 100644
--- a/itests/test/src/test/filtered-resources/etc/feature.xml
+++ b/itests/test/src/test/filtered-resources/etc/feature.xml
@@ -191,7 +191,6 @@
#
# Role name used for SSH access authorization
- # If not set, this defaults to the ${karaf.admin.role} configured
in etc/system.properties
#
# sshRole = admin
diff --git a/manual/src/main/asciidoc/user-guide/monitoring.adoc
b/manual/src/main/asciidoc/user-guide/monitoring.adoc
index 9b7a8202c5..34a94abd21 100644
--- a/manual/src/main/asciidoc/user-guide/monitoring.adoc
+++ b/manual/src/main/asciidoc/user-guide/monitoring.adoc
@@ -110,7 +110,6 @@ objectName = connector:name=rmi
#
# Role name used for JMX access authorization
-# If not set, this defaults to the ${karaf.admin.role} configured in
etc/system.properties
#
# jmxRole=admin
----
diff --git a/manual/src/main/asciidoc/user-guide/remote.adoc
b/manual/src/main/asciidoc/user-guide/remote.adoc
index 607153a8a1..3fa6178dd5 100644
--- a/manual/src/main/asciidoc/user-guide/remote.adoc
+++ b/manual/src/main/asciidoc/user-guide/remote.adoc
@@ -83,7 +83,6 @@ hostKey = ${karaf.etc}/host.key
#
# Role name used for SSH access authorization
-# If not set, this defaults to the ${karaf.admin.role} configured in
etc/system.properties
#
# sshRole = admin
@@ -125,8 +124,7 @@ The `etc/org.apache.karaf.shell.cfg` configuration file
contains different prope
address of the network interface.
* `hostKey` is the location of the `host.key` file. By defaut, it uses
`etc/host.key`. This file stores the public
and private key pair of the SSHd server.
-* `sshRole` is the default role used for SSH access. The default value is the
value of `karaf.admin.role` property
- defined in `etc/system.properties`. See the [Security section|security] of
this user guide for details.
+* `sshRole` is the default role used for SSH access. See the [Security
section|security] of this user guide for details.
* `sftpEnabled` controls if the SSH server start the SFTP system or not. When
enabled, Karaf SSHd supports SFTP, meaning
that you can remotely access to the Karaf filesystem with any sftp clients.
* `keySize` is the key size used by the SSHd server. The possible values are
1024, 2048, 3072, or 4096. The default
diff --git
a/webconsole/console/src/main/java/org/apache/felix/webconsole/internal/servlet/JaasSecurityProvider.java
b/webconsole/console/src/main/java/org/apache/felix/webconsole/internal/servlet/JaasSecurityProvider.java
index 5676a90e75..491ede3a17 100644
---
a/webconsole/console/src/main/java/org/apache/felix/webconsole/internal/servlet/JaasSecurityProvider.java
+++
b/webconsole/console/src/main/java/org/apache/felix/webconsole/internal/servlet/JaasSecurityProvider.java
@@ -87,7 +87,7 @@ public void updated(Dictionary<String, ?> properties) {
properties = new Hashtable<>();
}
realm = getString(properties, "realm", "karaf");
- role = getString(properties, "role",
System.getProperty("karaf.admin.role", "admin"));
+ role = getString(properties, "role", "admin");
sessionTimeout = Integer.parseInt(getString(properties,
"sessionTimeout", "0"));
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> org.apache.karaf.shell.cfg et al still reference obsolete 'karaf.admin.role'
> ----------------------------------------------------------------------------
>
> Key: KARAF-5263
> URL: https://issues.apache.org/jira/browse/KARAF-5263
> Project: Karaf
> Issue Type: Improvement
> Components: karaf
> Affects Versions: 4.0.9
> Reporter: Martin Lichtin
> Assignee: Jean-Baptiste Onofré
> Priority: Trivial
> Fix For: 4.2.2
>
>
> I believe karaf.admin.role is no longer supported:
> {noformat}
> #
> # Role name used for SSH access authorization
> # If not set, this defaults to the ${karaf.admin.role} configured in
> etc/system.properties
> #
> # sshRole = admin
> {noformat}
> Other occurences:
> * page https://karaf.apache.org/manual/latest/ the property name still occurs
> in 3 places.
> * JaasSecurityProvider.java
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
