# HG changeset patch # User Zdenek Zambersky # Date 1427796650 -7200 # Node ID 6310141695aeb73555e02eea557a8522c7e58db9 # Parent e78173df9ba0e57871d7f011c407957e172c1d17 Minor fixes: - reporter now wrapping reason in CDATA because it can also contain invalid chars ( <, >, & ) - expected data type of ip6Addr value of network-info record in mongo database changed from null to String - thermostat-roles.properties file updated so that now it equals to default one - client-tester user is now used also for command channel testing - head is now default version in ThermostatQA (in Makefile) diff -r e78173df9ba0 -r 6310141695ae Makefile --- a/Makefile Tue Mar 31 12:00:22 2015 +0200 +++ b/Makefile Tue Mar 31 12:10:50 2015 +0200 @@ -39,7 +39,7 @@ TOMCAT_DIR=$(BUILD_DIR)/$(TOMCAT_NAME) # refers to tested thermostat -THERMOSTAT_VERSION=1.1.0 +THERMOSTAT_VERSION=head THERMOSTAT_REPO_URL=http://icedtea.classpath.org/hg/thermostat/ THERMOSTAT_USER_DIR=$(BUILD_DIR)/.thermostat THERMOSTAT_DIR=$(BUILD_DIR)/thermostat diff -r e78173df9ba0 -r 6310141695ae scripts/check-collections-heap-dump.js --- a/scripts/check-collections-heap-dump.js Tue Mar 31 12:00:22 2015 +0200 +++ b/scripts/check-collections-heap-dump.js Tue Mar 31 12:10:50 2015 +0200 @@ -69,7 +69,7 @@ ["agentId","string"], ["interfaceName","string"], ["ip4Addr","string"], - ["ip6Addr","object null"] + ["ip6Addr","string"] ], "numa-host-info" : [ ["agentId","string"], diff -r e78173df9ba0 -r 6310141695ae src/org/thermostat/qa2/reporter/Generator.java --- a/src/org/thermostat/qa2/reporter/Generator.java Tue Mar 31 12:00:22 2015 +0200 +++ b/src/org/thermostat/qa2/reporter/Generator.java Tue Mar 31 12:10:50 2015 +0200 @@ -136,7 +136,7 @@ resultLine += result == TestResult.PASSED ? "" : ""; resultLine += "" + testName + "." + method.name + ""; if (method.reason != null) { - resultLine += ":  " + method.reason + ""; + resultLine += ":  "; } resultLine += "" + resultString + ""; output.add(resultLine); diff -r e78173df9ba0 -r 6310141695ae storageconfig/head/web-tomcat/thermostat-roles.properties --- a/storageconfig/head/web-tomcat/thermostat-roles.properties Tue Mar 31 12:00:22 2015 +0200 +++ b/storageconfig/head/web-tomcat/thermostat-roles.properties Tue Mar 31 12:10:50 2015 +0200 @@ -29,17 +29,41 @@ # Example recursive role definition allowed-to-do-everything agent-users. You # can uncomment the following lines and assign your agent users this # "thermostat-agent" role. -#thermostat-agent = thermostat-add, thermostat-replace, thermostat-update, \ -# thermostat-remove, thermostat-save-file, thermostat-purge, \ -# thermostat-register-category, thermostat-register-category, \ -# thermostat-cmdc-verify, thermostat-login, thermostat-realm +#thermostat-agent = thermostat-cmdc-verify, \ +# thermostat-login, \ +# thermostat-prepare-statement, \ +# thermostat-purge, \ +# thermostat-register-category, \ +# thermostat-realm, \ +# thermostat-save-file, \ +# thermostat-write, \ +# thermostat-files-grant-write-filename-ALL # # Example recursive role definition for allowed-to-see-everything client-users. # You may uncomment the following lines and assign your client users this -# "thermostat-client" role. -#thermostat-client = thermostat-realm, thermostat-login, thermostat-query, \ -# thermostat-cmdc-generate, thermostat-load-file, \ -# thermostat-register-category, thermostat-prepare-statement +# "thermostat-client" role. "thermostat-write" is needed by the notes plugin. +# It's okay to not grant this permissions, the notes functionality will not +# work. +#thermostat-client = thermostat-agents-grant-read-agentId-ALL, \ +# thermostat-cmdc-generate, \ +# thermostat-hosts-grant-read-hostname-ALL, \ +# thermostat-load-file, \ +# thermostat-login, \ +# thermostat-prepare-statement, \ +# thermostat-query, \ +# thermostat-realm, \ +# thermostat-register-category, \ +# thermostat-vms-grant-read-username-ALL, \ +# thermostat-vms-grant-read-vmId-ALL, \ +# thermostat-files-grant-read-filename-ALL, \ +# thermostat-write +# +# Example recursive role definition which allows thermostat users to +# use the clean-data command, which may perform global delete operations. +# Consider assigning this role to client users if they need to use the +# clean-data command. Note that other roles for thermostat client users +# grant read-only access - at various levels - only. +#thermostat-cmd-clean-data = thermostat-purge # # Example recursive role definition that grants all command channel privileges. # You may uncomment the following lines and assign your client users this @@ -50,26 +74,41 @@ # thermostat-cmdc-grant-killvm, \ # thermostat-cmdc-grant-ping, \ # thermostat-cmdc-grant-jmx-toggle-notifications -agent-tester=thermostat-agent -client-tester=thermostat-client -thermostat-agent=thermostat-write, \ - thermostat-save-file, \ - thermostat-purge, \ - thermostat-prepare-statement, \ - thermostat-register-category, \ - thermostat-cmdc-verify, \ - thermostat-login, \ - thermostat-realm -# Grants users who are member of the "thermostat-client" role ALL read privileges. -# See http://icedtea.classpath.org/wiki/?title=Thermostat/SecurityConsiderations#Thermostat_Access_Control -thermostat-client=thermostat-agents-grant-read-agentId-ALL, \ - thermostat-hosts-grant-read-hostname-ALL, \ - thermostat-vms-grant-read-vmId-ALL, \ - thermostat-vms-grant-read-username-ALL, \ - thermostat-realm, \ - thermostat-login, \ - thermostat-query, \ - thermostat-prepare-statement, \ - thermostat-cmdc-generate, \ - thermostat-load-file, \ - thermostat-register-category +# Roles for our two dev users +agent-tester=thermostat-agent, thermostat-grant-write-files-all-agent +# client-tester needs thermostat-purge role for clean-data command to work +client-tester=thermostat-grant-read-all-client, thermostat-cmdc, thermostat-purge +# Agent recursive role +thermostat-agent = thermostat-cmdc-verify, \ + thermostat-login, \ + thermostat-prepare-statement, \ + thermostat-purge, \ + thermostat-register-category, \ + thermostat-realm, \ + thermostat-save-file, \ + thermostat-write +# Grant agent to write any file +thermostat-grant-write-files-all-agent = thermostat-files-grant-write-filename-ALL + +# Client recursive role (granting a client to read all data + all files) +thermostat-grant-read-all-client = thermostat-agents-grant-read-agentId-ALL, \ + thermostat-cmdc-generate, \ + thermostat-hosts-grant-read-hostname-ALL, \ + thermostat-load-file, \ + thermostat-login, \ + thermostat-prepare-statement, \ + thermostat-query, \ + thermostat-realm, \ + thermostat-register-category, \ + thermostat-vms-grant-read-username-ALL, \ + thermostat-vms-grant-read-vmId-ALL, \ + thermostat-files-grant-read-filename-ALL, \ + thermostat-write +# Grants all command channel operations +thermostat-cmdc = thermostat-cmdc-grant-garbage-collect, \ + thermostat-cmdc-grant-dump-heap, \ + thermostat-cmdc-grant-thread-harvester, \ + thermostat-cmdc-grant-killvm, \ + thermostat-cmdc-grant-profile-vm, \ + thermostat-cmdc-grant-ping, \ + thermostat-cmdc-grant-jmx-toggle-notifications