Self-review

Author: labkey-jeckels

ms2/src/org/systemsbiology/jrap/MSXMLParser.java

@@ -144,7 +144,7 @@ public MSXMLParser(File file) {
         // Create parser using the centrally-configured, XXE-safe factory
         try
         {
-            parser = XmlBeansUtil.SAX_PARSER_FACTORY.newSAXParser().getXMLReader();
+            parser = XmlBeansUtil.SAX_PARSER_FACTORY_ALLOWING_DOCTYPE.newSAXParser().getXMLReader();
         } catch (Exception e)
         {
             System.err.println("error: Unable to instantiate parser");

protein/src/org/labkey/protein/ProteinController.java

@@ -1424,11 +1424,6 @@ public void testActionPermissions()
 
             ProteinController controller = new ProteinController();
 
-            // @RequiresPermission(AdminPermission.class)
-            assertForAdminPermission(user,
-                    new SetBestNameAction()
-            );
-
             // @RequiresSiteAdmin
             assertForRequiresSiteAdmin(user,
                 controller.new LoadGoAction(),
@@ -1445,7 +1440,8 @@ controller.new ShowAnnotInsertDetailsAction()
             // @AdminConsoleAction
             // @RequiresPermission(AdminOperationsPermission.class)
             assertForAdminOperationsPermission(ContainerManager.getRoot(), user,
-                    controller.new ShowProteinAdminAction()
+                    controller.new ShowProteinAdminAction(),
+                    new SetBestNameAction()
             );
         }
     }