You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/11/03 14:25:44 UTC
svn commit: r1767890 - in /qpid/java/branches/6.1.x: ./
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/model/adapter/
broker-plugins/management-http/src/main/java/resources/css/
broker-plugins/m...
Author: orudyy
Date: Thu Nov 3 14:25:44 2016
New Revision: 1767890
URL: http://svn.apache.org/viewvc?rev=1767890&view=rev
Log:
QPID-7485: [Java Broker] Make the path attribute immutable on file based authentication/group providers
merged from trunk using
svn merge -c 1767523,1767882 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/ExternalFileBasedAuthenticationManager.java
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/query/WhereCriteria.html
qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 3 14:25:44 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767825
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767825,1767882
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/ExternalFileBasedAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/ExternalFileBasedAuthenticationManager.java?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/ExternalFileBasedAuthenticationManager.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/ExternalFileBasedAuthenticationManager.java Thu Nov 3 14:25:44 2016
@@ -24,7 +24,7 @@ public interface ExternalFileBasedAuthen
{
String PATH = "path";
- @ManagedAttribute( mandatory = true, description = "File location")
+ @ManagedAttribute( mandatory = true, description = "File location", immutable = true)
public String getPath();
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java Thu Nov 3 14:25:44 2016
@@ -30,6 +30,6 @@ public interface FileBasedGroupProvider<
{
String PATH="path";
- @ManagedAttribute( mandatory = true, description = "File location" )
+ @ManagedAttribute( mandatory = true, description = "File location", immutable = true)
String getPath();
}
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java Thu Nov 3 14:25:44 2016
@@ -103,16 +103,6 @@ public class FileBasedGroupProviderImpl
}
@Override
- protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
- {
- super.validateChange(proxyForValidation, changedAttributes);
- if(changedAttributes.contains(PATH))
- {
- throw new IllegalArgumentException("Cannot change the path");
- }
- }
-
- @Override
protected void onOpen()
{
super.onOpen();
Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/css/common.css Thu Nov 3 14:25:44 2016
@@ -428,12 +428,13 @@ div .messages {
width:100%;
}
-.criteriaControl.dijitTextBoxReadOnly,
-.claro .criteriaControl.dijitTextBoxReadOnly,
-.claro .criteriaControl.dijitTextBoxReadOnlyFocused .dijitInputContainer
+.readOnly.dijitTextBoxReadOnly,
+.claro .readOnly.dijitTextBoxReadOnly,
+.claro .readOnly.dijitTextBoxReadOnlyFocused .dijitInputContainer
{
background-color: #efefef !important;
background-image: none !important;
+ border-color: #d3d3d3;
}
.advancedSearchItem
Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/base64md5passwordfile/add.js Thu Nov 3 14:25:44 2016
@@ -25,11 +25,9 @@ define(["dojo/query", "dijit/registry",
{
util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html", function ()
{
- if (data.data)
- {
- var path = registry.byNode(query(".path", data.containerNode)[0]);
- path.set("value", data.data.path);
- }
+ var pathWidget = registry.byNode(query(".path", data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true : false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/plainpasswordfile/add.js Thu Nov 3 14:25:44 2016
@@ -25,11 +25,9 @@ define(["dojo/query", "dijit/registry",
{
util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/filebased/add.html", function ()
{
- if (data.data)
- {
- var path = registry.byNode(query(".path", data.containerNode)[0]);
- path.set("value", data.data.path);
- }
+ var pathWidget = registry.byNode(query(".path", data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true : false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/groupfile/add.js Thu Nov 3 14:25:44 2016
@@ -32,11 +32,9 @@ define(["dojo/dom",
var that = this;
util.parse(data.containerNode, template, function ()
{
- if (data.data)
- {
- var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
- pathWidget.set("value", data.data.path);
- }
+ var pathWidget = registry.byNode(query(".addGroupProviderPath", data.containerNode)[0]);
+ pathWidget.set("disabled", data.data && data.data.id ? true : false);
+ pathWidget.set("value", data.data ? data.data.path : "");
});
}
};
Modified: qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/query/WhereCriteria.html
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/query/WhereCriteria.html?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/query/WhereCriteria.html (original)
+++ qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/query/WhereCriteria.html Thu Nov 3 14:25:44 2016
@@ -30,7 +30,7 @@
return false;
</script>
- <input class="criteriaControl"
+ <input class="criteriaControl readOnly"
data-dojo-type="dijit/form/TextBox"
data-dojo-attach-point="newColumnCondition"
data-dojo-props="readOnly:true, title: 'Current where expression'"/>
Modified: qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java (original)
+++ qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java Thu Nov 3 14:25:44 2016
@@ -262,11 +262,12 @@ public class AuthenticationProviderRestT
try
{
principalDatabase = getDefaultBrokerConfiguration().createTemporaryPasswordFile(new String[]{"admin2", "guest2", "test2"});
- attributes = new HashMap<String, Object>();
+ attributes = new HashMap<>();
attributes.put(AuthenticationProvider.NAME, providerName);
attributes.put(AuthenticationProvider.ID, id);
attributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE);
- attributes.put(ExternalFileBasedAuthenticationManager.PATH, principalDatabase.getAbsolutePath());
+
+ file.createNewFile();
int status = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes);
assertEquals("ACL was not deleted", 200, status);
@@ -274,7 +275,7 @@ public class AuthenticationProviderRestT
provider = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName);
assertEquals("Unexpected id", id.toString(), provider.get(AuthenticationProvider.ID));
assertEquals("Unexpected name", providerName, provider.get(AuthenticationProvider.NAME));
- assertEquals("Unexpected path", principalDatabase.getAbsolutePath() , provider.get(
+ assertEquals("Unexpected path", file.getAbsolutePath() , provider.get(
ExternalFileBasedAuthenticationManager.PATH));
assertEquals("Unexpected state", State.ACTIVE.name() , provider.get(AuthenticationProvider.STATE));
}
Modified: qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1767890&r1=1767889&r2=1767890&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original)
+++ qpid/java/branches/6.1.x/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Thu Nov 3 14:25:44 2016
@@ -43,6 +43,7 @@ import org.apache.qpid.server.model.Grou
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
+import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.adapter.FileBasedGroupProvider;
import org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl;
@@ -154,13 +155,10 @@ public class BrokerACLTest extends QpidR
assertAuthenticationProviderExists(providerName);
- File file = TestFileUtils.createTempFile(this, ".users", "guest:guest\n" + ALLOWED_USER + ":" + ALLOWED_USER + "\n"
- + DENIED_USER + ":" + DENIED_USER);
-
- Map<String, Object> attributes = new HashMap<String, Object>();
+ Map<String, Object> attributes = new HashMap<>();
attributes.put(AuthenticationProvider.NAME, providerName);
attributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE);
- attributes.put(ExternalFileBasedAuthenticationManager.PATH, file.getAbsolutePath());
+ attributes.put(AuthenticationProvider.STATE, State.DELETED.name());
int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes);
assertEquals("Setting of provider attribites should be allowed", 200, responseCode);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org