You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@solr.apache.org by GitBox <gi...@apache.org> on 2021/11/08 08:19:03 UTC
[GitHub] [solr] janhoy opened a new pull request #399: SOLR-15776: Add list of permissions to systemInfo call
janhoy opened a new pull request #399:
URL: https://github.com/apache/solr/pull/399
https://issues.apache.org/jira/browse/SOLR-15776
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy edited a comment on pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy edited a comment on pull request #399:
URL: https://github.com/apache/solr/pull/399#issuecomment-1013863128
I added two more improvements:
* Determine if shcemeDesignerEnabled by isPermitted() checks instead of HTTP call
* Disable clickable log-levels page if you don't have CONFIG_EDIT permission. This is just a partial fix, as the mouse pointer still changes to hand and the edit symbol comes up. But nothing happens when clicking.
TODO
* I user has a custom Authorization plugin that don't use RBAP, the UI should fall back to always return true for `isPermitted()`, as checking for the predefined permissions won't make much sense
* ~Open a JIRA for remaining UI work (hiding/dimming menu choices and buttons everywhere in UI based on [mappings](https://docs.google.com/spreadsheets/d/1s2xokDxw9IkXr7ZA5n06RPDj6EwvpbsZ7zUeKpvRC3Q/edit?usp=sharing))~ See https://issues.apache.org/jira/browse/SOLR-15928
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] madrob commented on a change in pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
madrob commented on a change in pull request #399:
URL: https://github.com/apache/solr/pull/399#discussion_r785269023
##########
File path: solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPluginBase.java
##########
@@ -110,6 +113,19 @@ public AuthorizationResponse authorize(AuthorizationContext context) {
return flag.rsp;
}
+ /**
+ * Retrieves permission names for a given set of roles
+ */
+ public Set<String> getPermissionNamesForRoles(Set<String> roles) {
+ Set<String> permissions = new HashSet<>();
+ for (String r : roles) {
+ if (roleToPermissionsMap.containsKey(r)) {
Review comment:
Let’s use a fully functional approach with flat map rather than mixing here
##########
File path: solr/webapp/web/js/angular/permissions.js
##########
@@ -0,0 +1,51 @@
+/*
+ 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.
+*/
+
+const permissions = {
+ COLL_EDIT_PERM: "collection-admin-edit",
Review comment:
I really don’t like that this is duplicated but I don’t have a better approach
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy commented on a change in pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy commented on a change in pull request #399:
URL: https://github.com/apache/solr/pull/399#discussion_r785429493
##########
File path: solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPluginBase.java
##########
@@ -110,6 +113,19 @@ public AuthorizationResponse authorize(AuthorizationContext context) {
return flag.rsp;
}
+ /**
+ * Retrieves permission names for a given set of roles
+ */
+ public Set<String> getPermissionNamesForRoles(Set<String> roles) {
+ Set<String> permissions = new HashSet<>();
+ for (String r : roles) {
+ if (roleToPermissionsMap.containsKey(r)) {
Review comment:
The unit test uncovered a NPE that I also fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy commented on pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy commented on pull request #399:
URL: https://github.com/apache/solr/pull/399#issuecomment-1014446987
Both TODOs are now done. Turned out that there was an exception if Auth was not enabled since we tried to use an undefined variable. Now we check whether `userPermissions` is `undefined`, which means that auth(z) is not enabled, in which case Admin UI allows everything.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy commented on a change in pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy commented on a change in pull request #399:
URL: https://github.com/apache/solr/pull/399#discussion_r785357379
##########
File path: solr/webapp/web/js/angular/permissions.js
##########
@@ -0,0 +1,51 @@
+/*
+ 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.
+*/
+
+const permissions = {
+ COLL_EDIT_PERM: "collection-admin-edit",
Review comment:
The alternative would be to read a JS-string from some backend API and `eval()` it :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy commented on a change in pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy commented on a change in pull request #399:
URL: https://github.com/apache/solr/pull/399#discussion_r785361676
##########
File path: solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPluginBase.java
##########
@@ -110,6 +113,19 @@ public AuthorizationResponse authorize(AuthorizationContext context) {
return flag.rsp;
}
+ /**
+ * Retrieves permission names for a given set of roles
+ */
+ public Set<String> getPermissionNamesForRoles(Set<String> roles) {
+ Set<String> permissions = new HashSet<>();
+ for (String r : roles) {
+ if (roleToPermissionsMap.containsKey(r)) {
Review comment:
Done. Also added a unit test for this new method.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy edited a comment on pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy edited a comment on pull request #399:
URL: https://github.com/apache/solr/pull/399#issuecomment-1013863128
I added two more improvements:
* Determine if shcemeDesignerEnabled by isPermitted() checks instead of HTTP call
* Disable clickable log-levels page if you don't have CONFIG_EDIT permission. This is just a partial fix, as the mouse pointer still changes to hand and the edit symbol comes up. But nothing happens when clicking.
TODO
* ~If user has a custom Authorization plugin that don't use RBAP, the UI should fall back to always return true for `isPermitted()`, as checking for the predefined permissions won't make much sense~
* ~Open a JIRA for remaining UI work (hiding/dimming menu choices and buttons everywhere in UI based on [mappings](https://docs.google.com/spreadsheets/d/1s2xokDxw9IkXr7ZA5n06RPDj6EwvpbsZ7zUeKpvRC3Q/edit?usp=sharing))~ See https://issues.apache.org/jira/browse/SOLR-15928
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy merged pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy merged pull request #399:
URL: https://github.com/apache/solr/pull/399
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy commented on a change in pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy commented on a change in pull request #399:
URL: https://github.com/apache/solr/pull/399#discussion_r785357379
##########
File path: solr/webapp/web/js/angular/permissions.js
##########
@@ -0,0 +1,51 @@
+/*
+ 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.
+*/
+
+const permissions = {
+ COLL_EDIT_PERM: "collection-admin-edit",
Review comment:
The alternative would be to read a JS-string from some backend API and `eval()` it :) But you really need for the UI to know the permissions statically for all the checks anyway, so it would not solve anything.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
[GitHub] [solr] janhoy commented on pull request #399: SOLR-15776 Make Admin UI play well with Authorization
Posted by GitBox <gi...@apache.org>.
janhoy commented on pull request #399:
URL: https://github.com/apache/solr/pull/399#issuecomment-1013863128
I added two more improvements:
* Determine if shcemeDesignerEnabled by isPermitted() checks instead of HTTP call
* Disable clickable log-levels page if you don't have CONFIG_EDIT permission. This is just a partial fix, as the mouse pointer still changes to hand and the edit symbol comes up. But nothing happens when clicking.
TODO
* I user has a custom Authorization plugin that don't use RBAP, the UI should fall back to always return true for `isPermitted()`, as checking for the predefined permissions won't make much sense
* Open a JIRA for remaining UI work (hiding/dimming menu choices and buttons everywhere in UI based on [mappings](https://docs.google.com/spreadsheets/d/1s2xokDxw9IkXr7ZA5n06RPDj6EwvpbsZ7zUeKpvRC3Q/edit?usp=sharing))
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org