/hg/icedtea-web: PolicyEditor parsing enhancements, new tests, a...
aazores at icedtea.classpath.org
aazores at icedtea.classpath.org
Mon Mar 10 16:18:05 UTC 2014
changeset 17c6e5a59602 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=17c6e5a59602
author: Andrew Azores <aazores at redhat.com>
date: Mon Mar 10 12:17:56 2014 -0400
PolicyEditor parsing enhancements, new tests, and bug fixes
* NEWS: added entry for PolicyEditor
* netx/net/sourceforge/jnlp/resources/Messages.properties:
(PESaveAsMenuItemMnemonic, PEExitMenuItemMnemonic) changed mnemonic keys
due to masking with ctrl rather than alt
* netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java:
(ACTIONS_PERMISSION, TARGET_PERMISSION, fromString) use regexes to parse
* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
(file) keep reference to File rather than String filePath. (getPermissions)
returns empty map rather than null. (setComponentMnemonic) new method.
(getCustomPermissions) new function. (openAndParsePolicyFile) check for
OpenFileResult FAILURE and NOT_FILE rather than null. (setupLayout) File,
Save, SaveAs, and Exit items modifier mask changed to Ctrl rather than Alt
* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissions.java:
(fromString) use regexes to parse, using CustomPermission as intermediate
representation
* netx/net/sourceforge/jnlp/util/FileUtils.java:
(testDirectoryPermissions) add check for getCanonicalFile and null
safeguarding. (testFilePermissions) add check for getCanonicalFile and
return FAILURE rather than null
* tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java:
(testMissingQuotationMarks) new test
* tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java:
(testReturnedCustomPermissionsSetIsCopy,
testCodebaseTrailingSlashesDoNotMatch) new tests
* tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorParsingTest.java:
new tests
diffstat:
ChangeLog | 30 +
NEWS | 1 +
netx/net/sourceforge/jnlp/resources/Messages.properties | 8 +-
netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java | 52 +-
netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java | 214 +++++-
netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissions.java | 35 +-
netx/net/sourceforge/jnlp/util/FileUtils.java | 22 +-
tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java | 48 +-
tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorParsingTest.java | 290 ++++++++++
tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissionsTest.java | 41 +
tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java | 21 +
11 files changed, 644 insertions(+), 118 deletions(-)
diffs (truncated from 1168 to 500 lines):
diff -r 2157f0e06002 -r 17c6e5a59602 ChangeLog
--- a/ChangeLog Mon Mar 10 11:57:12 2014 -0400
+++ b/ChangeLog Mon Mar 10 12:17:56 2014 -0400
@@ -1,3 +1,33 @@
+2014-03-10 Andrew Azores <aazores at redhat.com>
+
+ PolicyEditor parsing enhancements, new tests, and bugfixes
+ * NEWS: added entry for PolicyEditor
+ * netx/net/sourceforge/jnlp/resources/Messages.properties:
+ (PESaveAsMenuItemMnemonic, PEExitMenuItemMnemonic) changed mnemonic keys
+ due to masking with ctrl rather than alt
+ * netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java:
+ (ACTIONS_PERMISSION, TARGET_PERMISSION, fromString) use regexes to parse
+ * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
+ (file) keep reference to File rather than String filePath. (getPermissions)
+ returns empty map rather than null. (setComponentMnemonic) new method.
+ (getCustomPermissions) new function. (openAndParsePolicyFile) check for
+ OpenFileResult FAILURE and NOT_FILE rather than null. (setupLayout) File,
+ Save, SaveAs, and Exit items modifier mask changed to Ctrl rather than Alt
+ * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissions.java:
+ (fromString) use regexes to parse, using CustomPermission as intermediate
+ representation
+ * netx/net/sourceforge/jnlp/util/FileUtils.java:
+ (testDirectoryPermissions) add check for getCanonicalFile and null
+ safeguarding. (testFilePermissions) add check for getCanonicalFile and
+ return FAILURE rather than null
+ * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/CustomPermissionTest.java:
+ (testMissingQuotationMarks) new test
+ * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorTest.java:
+ (testReturnedCustomPermissionsSetIsCopy,
+ testCodebaseTrailingSlashesDoNotMatch) new tests
+ * tests/netx/unit/net/sourceforge/jnlp/security/policyeditor/PolicyEditorParsingTest.java:
+ new tests
+
2014-03-10 Omair Majid <omajid at redhat.com>
* Makefile.am (install-data-local): Install itweb-settings.1.
diff -r 2157f0e06002 -r 17c6e5a59602 NEWS
--- a/NEWS Mon Mar 10 11:57:12 2014 -0400
+++ b/NEWS Mon Mar 10 12:17:56 2014 -0400
@@ -17,6 +17,7 @@
* Support for u45 and u51 new manifest attributes (Application-Name, Codebase)
* Custom applet permission policies panel in itweb-settings control panel
* javaws -version flag
+* New PolicyEditor for easily adding/removing permissions to individual applets
* Cache Viewer
- Can be closed by ESC key
- Enabling and disabling of operational buttons is handled properly
diff -r 2157f0e06002 -r 17c6e5a59602 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Mar 10 11:57:12 2014 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Mar 10 12:17:56 2014 -0400
@@ -519,10 +519,10 @@
PEOpenMenuItemMnemonic=79
# S
PESaveMenuItemMnemonic=83
-# V
-PESaveAsMenuItemMnemonic=86
-# E
-PEExitMenuItemMnemonic=69
+# A
+PESaveAsMenuItemMnemonic=65
+# X
+PEExitMenuItemMnemonic=88
# U
PECustomPermissionsItemMnemonic=85
diff -r 2157f0e06002 -r 17c6e5a59602 netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java
--- a/netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java Mon Mar 10 11:57:12 2014 -0400
+++ b/netx/net/sourceforge/jnlp/security/policyeditor/CustomPermission.java Mon Mar 10 12:17:56 2014 -0400
@@ -36,6 +36,9 @@
package net.sourceforge.jnlp.security.policyeditor;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* This class models a permission entry in a policy file which is not included
* in the default set of permissions used by the PolicyEditor, ie, permissions
@@ -43,6 +46,18 @@
*/
public class CustomPermission implements Comparable<CustomPermission> {
+ /* Matches eg 'permission java.io.FilePermission "${user.home}${/}*", "read";'
+ * eg permissions that have a permission type, target, and actions set.
+ */
+ public static final Pattern ACTIONS_PERMISSION =
+ Pattern.compile("\\s*permission\\s+([\\w\\.]+)\\s+\"([^\"]+)\",\\s*\"([^\"]*)\";.*");
+
+ /* Matches eg 'permission java.lang.RuntimePermission "queuePrintJob";'
+ * eg permissions that have a permission type and target, but no actions.
+ */
+ public static final Pattern TARGET_PERMISSION =
+ Pattern.compile("\\s*permission\\s+([\\w\\.]+)\\s+\"([^\"]+)\";.*");
+
public final String type, target, actions;
/**
@@ -63,16 +78,23 @@
* @return a CustomPermission representing this string
*/
public static CustomPermission fromString(final String string) {
- final String[] parts = string.trim().split(" ");
- if (!parts[0].equals("permission") || parts.length < 3 || !string.trim().endsWith(";")) {
- return null;
+ final String typeStr, targetStr, actionsStr;
+
+ final Matcher actionMatcher = ACTIONS_PERMISSION.matcher(string);
+ if (actionMatcher.matches()) {
+ typeStr = actionMatcher.group(1);
+ targetStr = actionMatcher.group(2);
+ actionsStr = actionMatcher.group(3);
+ } else {
+ final Matcher targetMatcher = TARGET_PERMISSION.matcher(string);
+ if (!targetMatcher.matches()) {
+ return null;
+ }
+ typeStr = targetMatcher.group(1);
+ targetStr = targetMatcher.group(2);
+ actionsStr = "";
}
- final String typeStr = removeQuotes(parts[1]);
- final String targetStr = removeQuotes(removeSemicolon(removeComma(parts[2])));
- String actionsStr = "";
- if (parts.length > 3) {
- actionsStr = removeQuotes(removeSemicolon(parts[3]));
- }
+
return new CustomPermission(typeStr, targetStr, actionsStr);
}
@@ -96,18 +118,6 @@
return sb.toString();
}
- private static String removeQuotes(final String string) {
- return string.replaceAll("\"", "");
- }
-
- private static String removeSemicolon(final String string) {
- return string.replaceAll(";", "");
- }
-
- private static String removeComma(final String string) {
- return string.replaceAll(",", "");
- }
-
@Override
public int compareTo(final CustomPermission o) {
if (this == o) {
diff -r 2157f0e06002 -r 17c6e5a59602 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java
--- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Mon Mar 10 11:57:12 2014 -0400
+++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Mon Mar 10 12:17:56 2014 -0400
@@ -56,6 +56,7 @@
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -66,6 +67,7 @@
import java.util.regex.Pattern;
import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
import javax.swing.Action;
import javax.swing.DefaultListModel;
import javax.swing.JButton;
@@ -146,7 +148,7 @@
private static final String AUTOGENERATED_NOTICE = "/* DO NOT MODIFY! AUTO-GENERATED */";
- private String filePath;
+ private File file;
private boolean changesMade = false;
private boolean closed = false;
private final Map<String, Map<PolicyEditorPermissions, Boolean>> codebasePermissionsMap = new HashMap<String, Map<PolicyEditorPermissions, Boolean>>();
@@ -169,10 +171,6 @@
super();
setLayout(new GridBagLayout());
- this.filePath = filepath;
-
- fileChooser = new JFileChooser(filePath);
-
for (final PolicyEditorPermissions perm : PolicyEditorPermissions.values()) {
final JCheckBox box = new JCheckBox();
box.setText(perm.getName());
@@ -180,16 +178,14 @@
checkboxMap.put(perm, box);
}
- if (filePath != null) {
- try {
- new URL("file://" + filePath);
- openAndParsePolicyFile();
- } catch (final MalformedURLException e) {
- OutputController.getLogger().log(e);
- FileUtils.showCouldNotOpenFilepathDialog(weakThis.get(), filepath);
- }
+ if (filepath != null) {
+ file = new File(filepath);
+ openAndParsePolicyFile();
}
+ fileChooser = new JFileChooser(file);
+ fileChooser.setFileHidingEnabled(false);
+
initializeMapForCodebase("");
listModel.addElement(R("PEGlobalSettings"));
updateCheckboxes("");
@@ -197,15 +193,15 @@
okButtonAction = new ActionListener() {
@Override
public void actionPerformed(final ActionEvent event) {
- if (filePath == null) {
+ if (file == null) {
final int choice = fileChooser.showOpenDialog(weakThis.get());
if (choice == JFileChooser.APPROVE_OPTION) {
- filePath = fileChooser.getSelectedFile().getAbsolutePath();
+ file = fileChooser.getSelectedFile();
}
}
// May still be null if user cancelled the file chooser
- if (filePath != null) {
+ if (file != null) {
savePolicyFile();
}
}
@@ -253,7 +249,7 @@
}
final int choice = fileChooser.showOpenDialog(weakThis.get());
if (choice == JFileChooser.APPROVE_OPTION) {
- filePath = fileChooser.getSelectedFile().getAbsolutePath();
+ file = fileChooser.getSelectedFile();
openAndParsePolicyFile();
}
}
@@ -264,7 +260,7 @@
public void actionPerformed(final ActionEvent e) {
final int choice = fileChooser.showSaveDialog(weakThis.get());
if (choice == JFileChooser.APPROVE_OPTION) {
- filePath = fileChooser.getSelectedFile().getAbsolutePath();
+ file = fileChooser.getSelectedFile();
savePolicyFile();
}
}
@@ -315,10 +311,18 @@
closed = true;
}
+ /**
+ * Check if the PolicyEditor instance has been visually closed
+ * @return if the PolicyEditor instance has been closed
+ */
public boolean isClosed() {
return closed;
}
+ /**
+ * Called by the Custom Policy Viewer on its parent Policy Editor when
+ * the Custom Policy Viewer is closing
+ */
void customPolicyViewerClosing() {
cpViewer = null;
}
@@ -341,6 +345,26 @@
* @param action to be performed
* @param identifier an identifier for the action
*/
+ private void setAccelerator(final String trigger, final int modifiers, final Action action, final String identifier) {
+ final int trig;
+ try {
+ trig = Integer.parseInt(trigger);
+ } catch (final NumberFormatException nfe) {
+ OutputController.getLogger().log("Unable to set accelerator action \""
+ + identifier + "\" for trigger \"" + trigger + "\"");
+ OutputController.getLogger().log(nfe);
+ return;
+ }
+ setAccelerator(trig, modifiers, action, identifier);
+ }
+
+ /**
+ * Set a key accelerator
+ * @param trigger the accelerator key
+ * @param modifiers Alt, Ctrl, or other modifiers to be held with the trigger
+ * @param action to be performed
+ * @param identifier an identifier for the action
+ */
private void setAccelerator(final int trigger, final int modifiers, final Action action, final String identifier) {
final KeyStroke key = KeyStroke.getKeyStroke(trigger, modifiers);
final JRootPane root = getRootPane();
@@ -371,7 +395,7 @@
interactivelyAddCodebase();
}
};
- setAccelerator(Integer.parseInt(R("PEAddCodebaseMnemonic")), ActionEvent.ALT_MASK, act, "AddCodebaseAccelerator");
+ setAccelerator(R("PEAddCodebaseMnemonic"), ActionEvent.ALT_MASK, act, "AddCodebaseAccelerator");
}
/**
@@ -384,7 +408,7 @@
removeCodebase((String) list.getSelectedValue());
}
};
- setAccelerator(Integer.parseInt(R("PERemoveCodebaseMnemonic")), ActionEvent.ALT_MASK, act, "RemoveCodebaseAccelerator");
+ setAccelerator(R("PERemoveCodebaseMnemonic"), ActionEvent.ALT_MASK, act, "RemoveCodebaseAccelerator");
}
/**
@@ -397,7 +421,7 @@
savePolicyFile();
}
};
- setAccelerator(Integer.parseInt(R("PEOkButtonMnemonic")), ActionEvent.ALT_MASK, act, "OkButtonAccelerator");
+ setAccelerator(R("PEOkButtonMnemonic"), ActionEvent.ALT_MASK, act, "OkButtonAccelerator");
}
/**
@@ -410,7 +434,7 @@
quit();
}
};
- setAccelerator(Integer.parseInt(R("PECancelButtonMnemonic")), ActionEvent.ALT_MASK, act, "CancelButtonAccelerator");
+ setAccelerator(R("PECancelButtonMnemonic"), ActionEvent.ALT_MASK, act, "CancelButtonAccelerator");
}
/**
@@ -533,7 +557,29 @@
* @return a map of permissions to whether these permissions are set for the given codebase
*/
public Map<PolicyEditorPermissions, Boolean> getPermissions(final String codebase) {
- return new HashMap<PolicyEditorPermissions, Boolean>(codebasePermissionsMap.get(codebase));
+ final Map<PolicyEditorPermissions, Boolean> permissions = codebasePermissionsMap.get(codebase);
+ if (permissions != null) {
+ return new HashMap<PolicyEditorPermissions, Boolean>(permissions);
+ } else {
+ final Map<PolicyEditorPermissions, Boolean> blank = new HashMap<PolicyEditorPermissions, Boolean>();
+ for (final PolicyEditorPermissions perm : PolicyEditorPermissions.values()) {
+ blank.put(perm, false);
+ }
+ return blank;
+ }
+ }
+
+ /**
+ * @param codebase the codebase to query
+ * @return a collection of CustomPermissions granted to the given codebase
+ */
+ public Collection<CustomPermission> getCustomPermissions(final String codebase) {
+ final Collection<CustomPermission> permissions = customPermissionsMap.get(codebase);
+ if (permissions != null) {
+ return new HashSet<CustomPermission>(permissions);
+ } else {
+ return Collections.emptySet();
+ }
}
/**
@@ -558,37 +604,53 @@
}
/**
+ * Set a mnemonic key for a menu item or button
+ * @param component the component for which to set a mnemonic
+ * @param mnemonic the mnemonic to set
+ */
+ private void setComponentMnemonic(final AbstractButton component, final String mnemonic) {
+ final int trig;
+ try {
+ trig = Integer.parseInt(mnemonic);
+ } catch (final NumberFormatException nfe) {
+ OutputController.getLogger().log(nfe);
+ return;
+ }
+ component.setMnemonic(trig);
+ }
+
+ /**
* Lay out all controls, tooltips, etc.
*/
private void setupLayout() {
final JMenu fileMenu = new JMenu(R("PEFileMenu"));
- fileMenu.setMnemonic(Integer.parseInt(R("PEFileMenuMnemonic")));
+ setComponentMnemonic(fileMenu, R("PEFileMenuMnemonic"));
final JMenuItem openItem = new JMenuItem(R("PEOpenMenuItem"));
- openItem.setMnemonic(Integer.parseInt(R("PEOpenMenuItemMnemonic")));
- openItem.setAccelerator(KeyStroke.getKeyStroke(openItem.getMnemonic(), ActionEvent.ALT_MASK));
+ setComponentMnemonic(openItem, R("PEOpenMenuItemMnemonic"));
+ openItem.setAccelerator(KeyStroke.getKeyStroke(openItem.getMnemonic(), ActionEvent.CTRL_MASK));
openItem.addActionListener(openButtonAction);
fileMenu.add(openItem);
final JMenuItem saveItem = new JMenuItem(R("PESaveMenuItem"));
- saveItem.setMnemonic(Integer.parseInt(R("PESaveMenuItemMnemonic")));
- saveItem.setAccelerator(KeyStroke.getKeyStroke(saveItem.getMnemonic(), ActionEvent.ALT_MASK));
+ setComponentMnemonic(saveItem, R("PESaveMenuItemMnemonic"));
+ saveItem.setAccelerator(KeyStroke.getKeyStroke(saveItem.getMnemonic(), ActionEvent.CTRL_MASK));
saveItem.addActionListener(okButtonAction);
fileMenu.add(saveItem);
final JMenuItem saveAsItem = new JMenuItem(R("PESaveAsMenuItem"));
- saveAsItem.setMnemonic(Integer.parseInt(R("PESaveAsMenuItemMnemonic")));
- saveAsItem.setAccelerator(KeyStroke.getKeyStroke(saveAsItem.getMnemonic(), ActionEvent.ALT_MASK));
+ setComponentMnemonic(saveAsItem, R("PESaveAsMenuItemMnemonic"));
+ saveAsItem.setAccelerator(KeyStroke.getKeyStroke(saveAsItem.getMnemonic(), ActionEvent.CTRL_MASK));
saveAsItem.addActionListener(saveAsButtonAction);
fileMenu.add(saveAsItem);
final JMenuItem exitItem = new JMenuItem(R("PEExitMenuItem"));
- exitItem.setMnemonic(Integer.parseInt(R("PEExitMenuItemMnemonic")));
- exitItem.setAccelerator(KeyStroke.getKeyStroke(exitItem.getMnemonic(), ActionEvent.ALT_MASK));
+ setComponentMnemonic(exitItem, R("PEExitMenuItemMnemonic"));
+ exitItem.setAccelerator(KeyStroke.getKeyStroke(exitItem.getMnemonic(), ActionEvent.CTRL_MASK));
exitItem.addActionListener(closeButtonAction);
fileMenu.add(exitItem);
menuBar.add(fileMenu);
final JMenu viewMenu = new JMenu(R("PEViewMenu"));
- viewMenu.setMnemonic(Integer.parseInt(R("PEViewMenuMnemonic")));
+ setComponentMnemonic(viewMenu, R("PEViewMenuMnemonic"));
final JMenuItem customPermissionsItem = new JMenuItem(R("PECustomPermissionsItem"));
- customPermissionsItem.setMnemonic(Integer.parseInt(R("PECustomPermissionsItemMnemonic")));
+ setComponentMnemonic(customPermissionsItem, R("PECustomPermissionsItemMnemonic"));
customPermissionsItem.setAccelerator(KeyStroke.getKeyStroke(customPermissionsItem.getMnemonic(), ActionEvent.ALT_MASK));
customPermissionsItem.addActionListener(viewCustomButtonAction);
@@ -668,34 +730,40 @@
addCodebaseButtonConstraints.fill = GridBagConstraints.HORIZONTAL;
addCodebaseButtonConstraints.gridx = 0;
addCodebaseButtonConstraints.gridy = listConstraints.gridy + listConstraints.gridheight + 1;
- addCodebaseButton.setMnemonic(Integer.parseInt(R("PEAddCodebaseMnemonic")));
+ setComponentMnemonic(addCodebaseButton, R("PEAddCodebaseMnemonic"));
add(addCodebaseButton, addCodebaseButtonConstraints);
final GridBagConstraints removeCodebaseButtonConstraints = new GridBagConstraints();
removeCodebaseButtonConstraints.fill = GridBagConstraints.HORIZONTAL;
removeCodebaseButtonConstraints.gridx = addCodebaseButtonConstraints.gridx + 1;
removeCodebaseButtonConstraints.gridy = addCodebaseButtonConstraints.gridy;
- removeCodebaseButton.setMnemonic(Integer.parseInt(R("PERemoveCodebaseMnemonic")));
+ setComponentMnemonic(removeCodebaseButton, R("PERemoveCodebaseMnemonic"));
add(removeCodebaseButton, removeCodebaseButtonConstraints);
final GridBagConstraints okButtonConstraints = new GridBagConstraints();
okButtonConstraints.fill = GridBagConstraints.HORIZONTAL;
okButtonConstraints.gridx = removeCodebaseButtonConstraints.gridx + 2;
okButtonConstraints.gridy = removeCodebaseButtonConstraints.gridy;
- okButton.setMnemonic(Integer.parseInt(R("PEOkButtonMnemonic")));
+ setComponentMnemonic(okButton, R("PEOkButtonMnemonic"));
add(okButton, okButtonConstraints);
final GridBagConstraints cancelButtonConstraints = new GridBagConstraints();
cancelButtonConstraints.fill = GridBagConstraints.HORIZONTAL;
cancelButtonConstraints.gridx = okButtonConstraints.gridx + 1;
cancelButtonConstraints.gridy = okButtonConstraints.gridy;
- closeButton.setMnemonic(Integer.parseInt(R("PECancelButtonMnemonic")));
+ setComponentMnemonic(closeButton, R("PECancelButtonMnemonic"));
add(closeButton, cancelButtonConstraints);
setMinimumSize(getPreferredSize());
pack();
}
+ /**
+ * Update the custom permissions map. Used by the Custom Policy Viewer to update its parent
+ * PolicyEditor to changes it has made
+ * @param codebase the codebase for which changes were made
+ * @param permissions the permissions granted to this codebase
+ */
void updateCustomPermissions(final String codebase, final Collection<CustomPermission> permissions) {
changesMade = true;
customPermissionsMap.get(codebase).clear();
@@ -710,9 +778,17 @@
new Thread() {
@Override
public void run() {
- OpenFileResult ofr = FileUtils.testFilePermissions(new File(filePath));
- if (ofr == null) {
- FileUtils.showCouldNotOpenFilepathDialog(weakThis.get(), filePath);
+ if (!file.exists()) {
+ try {
+ file.createNewFile();
+ } catch (final IOException e) {
+ OutputController.getLogger().log(e);
+ // If this fails we'll end up handling it a few lines down anyway.
+ }
+ }
+ OpenFileResult ofr = FileUtils.testFilePermissions(file);
+ if (ofr == OpenFileResult.FAILURE || ofr == OpenFileResult.NOT_FILE) {
+ FileUtils.showCouldNotOpenFilepathDialog(weakThis.get(), file.getPath());
return;
}
if (ofr == OpenFileResult.CANT_WRITE) {
@@ -720,24 +796,25 @@
}
final String contents;
try {
- contents = FileUtils.loadFileAsString(new File(filePath));
+ contents = FileUtils.loadFileAsString(file);
} catch (final IOException e) {
More information about the distro-pkg-dev
mailing list