You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/02/24 14:08:05 UTC
svn commit: r1661931 - in /qpid/branches/0.32: ./ qpid/ qpid/java/
qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/
qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/
qpid/java/broker-core/src/main/java/org/apach...
Author: kwall
Date: Tue Feb 24 13:08:04 2015
New Revision: 1661931
URL: http://svn.apache.org/r1661931
Log:
QPID-6247: Updates to configuration files should maintain existing file permissions
Merged from trunk with commands:
svn merge -c 1661162 https://svn.apache.org/repos/asf/qpid/trunk
svn merge -c 1661530 https://svn.apache.org/repos/asf/qpid/trunk
Added:
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/BaseAction.java
- copied unchanged from r1661162, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/BaseAction.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
- copied, changed from r1661162, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java
qpid/branches/0.32/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java
- copied unchanged from r1661162, qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/FileHelperTest.java
Modified:
qpid/branches/0.32/ (props changed)
qpid/branches/0.32/qpid/ (props changed)
qpid/branches/0.32/qpid/java/ (props changed)
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/Action.java
Propchange: qpid/branches/0.32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 13:08:04 2015
@@ -3,3 +3,4 @@
/qpid/branches/java-broker-bdb-ha2:1576683-1583556
/qpid/branches/java-network-refactor:805429-825319
/qpid/branches/mcpierce-QPID-4719:1477004-1477093
+/qpid/trunk:1661162,1661530
Propchange: qpid/branches/0.32/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 13:08:04 2015
@@ -6,4 +6,4 @@
/qpid/branches/mcpierce-QPID-4719/qpid:1477004-1477093
/qpid/branches/qpid-2935/qpid:1061302-1072333
/qpid/branches/qpid-3346/qpid:1144319-1179855
-/qpid/trunk/qpid:1661079,1661142,1661212,1661364,1661368,1661373
+/qpid/trunk/qpid:1661079,1661142,1661162,1661212,1661364,1661368,1661373,1661530
Propchange: qpid/branches/0.32/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 13:08:04 2015
@@ -9,4 +9,4 @@
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
/qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1661079,1661142,1661212,1661364,1661368,1661373
+/qpid/trunk/qpid/java:1661079,1661142,1661162,1661212,1661364,1661368,1661373,1661530
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java Tue Feb 24 13:08:04 2015
@@ -48,6 +48,7 @@ public class BrokerProperties
public static final String PROPERTY_QPID_HOME = "QPID_HOME";
public static final String PROPERTY_QPID_WORK = "QPID_WORK";
public static final String PROPERTY_LOG_RECORDS_BUFFER_SIZE = "qpid.broker_log_records_buffer_size";
+ public static final String POSIX_FILE_PERMISSIONS = "qpid.default_posix_file_permissions";
private BrokerProperties()
{
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java Tue Feb 24 13:08:04 2015
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.model;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.store.DurableConfigurationStore;
@@ -37,6 +38,9 @@ public interface SystemConfig<X extends
String INITIAL_CONFIGURATION_LOCATION = "initialConfigurationLocation";
String STARTUP_LOGGED_TO_SYSTEM_OUT = "startupLoggedToSystemOut";
+ @ManagedContextDefault(name = BrokerProperties.POSIX_FILE_PERMISSIONS)
+ String DEFAULT_POSIX_FILE_PERMISSIONS = "rw-r-----";
+
@ManagedAttribute(defaultValue = "false")
boolean isManagementMode();
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java Tue Feb 24 13:08:04 2015
@@ -34,6 +34,7 @@ import java.util.UUID;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Broker;
@@ -50,6 +51,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.group.FileGroupDatabase;
import org.apache.qpid.server.security.group.GroupPrincipal;
+import org.apache.qpid.server.util.FileHelper;
public class FileBasedGroupProviderImpl
extends AbstractConfiguredObject<FileBasedGroupProviderImpl> implements FileBasedGroupProvider<FileBasedGroupProviderImpl>
@@ -162,9 +164,11 @@ public class FileBasedGroupProviderImpl
{
throw new IllegalConfigurationException(String.format("Cannot create groups file at '%s'",_path));
}
+
try
{
- file.createNewFile();
+ String posixFileAttributes = getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS);
+ new FileHelper().createNewFile(file, posixFileAttributes);
}
catch (IOException e)
{
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java Tue Feb 24 13:08:04 2015
@@ -21,14 +21,14 @@
package org.apache.qpid.server.model.adapter;
-import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -38,6 +38,9 @@ import java.util.Set;
import java.util.TreeMap;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.configuration.BrokerProperties;
+import org.apache.qpid.server.util.BaseAction;
+import org.apache.qpid.server.util.FileHelper;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.ObjectMapper;
@@ -118,7 +121,7 @@ public class FileSystemPreferencesProvid
FileSystemPreferencesStore store = new FileSystemPreferencesStore(new File(_path));
// we need to check and create file if it does not exist every time on open
- store.createIfNotExist();
+ store.createIfNotExist(getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS));
store.open();
_store = store;
_open = true;
@@ -184,6 +187,7 @@ public class FileSystemPreferencesProvid
if(_store != null)
{
+ _store.close();
_store.delete();
deleted();
_authenticationProvider.setPreferencesProvider(null);
@@ -280,7 +284,7 @@ public class FileSystemPreferencesProvid
else
{
FileSystemPreferencesStore store = new FileSystemPreferencesStore(new File(_path));
- store.createIfNotExist();
+ store.createIfNotExist(getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS));
store.open();
_store = store;
}
@@ -334,9 +338,9 @@ public class FileSystemPreferencesProvid
{
private final ObjectMapper _objectMapper;
private final Map<String, Map<String, Object>> _preferences;
+ private final FileHelper _fileHelper;
private File _storeFile;
private FileLock _storeLock;
- private RandomAccessFile _storeRAF;
public FileSystemPreferencesStore(File preferencesFile)
{
@@ -345,9 +349,10 @@ public class FileSystemPreferencesProvid
_objectMapper.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
_objectMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
_preferences = new TreeMap<String, Map<String, Object>>();
+ _fileHelper = new FileHelper();
}
- public void createIfNotExist()
+ public void createIfNotExist(String filePermissions)
{
if (!_storeFile.exists())
{
@@ -358,7 +363,8 @@ public class FileSystemPreferencesProvid
}
try
{
- if (_storeFile.createNewFile() && !_storeFile.exists())
+ Path path = _fileHelper.createNewFile(_storeFile, filePermissions);
+ if (!Files.exists(path))
{
throw new IllegalConfigurationException(String.format("Cannot create preferences store file at '%s'", _storeFile.getAbsolutePath()));
}
@@ -391,43 +397,20 @@ public class FileSystemPreferencesProvid
}
try
{
- _storeRAF = new RandomAccessFile(_storeFile, "rw");
- FileChannel fileChannel = _storeRAF.getChannel();
- try
- {
- _storeLock = fileChannel.tryLock();
- }
- catch (OverlappingFileLockException e)
- {
- _storeLock = null;
- }
- if (_storeLock == null)
+ getFileLock(_storeFile.getPath() + ".lck");
+ if (_storeFile.length() > 0)
{
- throw new IllegalConfigurationException("Cannot get lock on store file " + _storeFile.getName()
- + " is another instance running?");
- }
- long fileSize = fileChannel.size();
- if (fileSize > 0)
- {
- ByteBuffer buffer = ByteBuffer.allocate((int) fileSize);
- fileChannel.read(buffer);
- buffer.rewind();
- buffer.flip();
- byte[] data = buffer.array();
- try
- {
- Map<String, Map<String, Object>> preferencesMap = _objectMapper.readValue(data,
- new TypeReference<Map<String, Map<String, Object>>>()
- {
- });
- _preferences.putAll(preferencesMap);
- }
- catch (JsonProcessingException e)
- {
- throw new IllegalConfigurationException("Cannot parse preferences json in " + _storeFile.getName(), e);
- }
+ Map<String, Map<String, Object>> preferencesMap = _objectMapper.readValue(_storeFile,
+ new TypeReference<Map<String, Map<String, Object>>>()
+ {
+ });
+ _preferences.putAll(preferencesMap);
}
}
+ catch (JsonProcessingException e)
+ {
+ throw new IllegalConfigurationException("Cannot parse preferences json in " + _storeFile.getName(), e);
+ }
catch (IOException e)
{
throw new IllegalConfigurationException("Cannot load preferences from " + _storeFile.getName(), e);
@@ -443,6 +426,7 @@ public class FileSystemPreferencesProvid
if (_storeLock != null)
{
_storeLock.release();
+ _storeLock.channel().close();
}
}
catch (IOException e)
@@ -452,22 +436,7 @@ public class FileSystemPreferencesProvid
finally
{
_storeLock = null;
- try
- {
- if (_storeRAF != null)
- {
- _storeRAF.close();
- }
- }
- catch (IOException e)
- {
- LOGGER.error("Cannot close preferences file", e);
- }
- finally
- {
- _storeRAF = null;
- _preferences.clear();
- }
+ _preferences.clear();
}
}
}
@@ -544,16 +513,14 @@ public class FileSystemPreferencesProvid
checkStoreOpened();
try
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- _objectMapper.writeValue(baos, _preferences);
- FileChannel channel = _storeRAF.getChannel();
- long currentSize = channel.size();
- channel.position(0);
- channel.write(ByteBuffer.wrap(baos.toByteArray()));
- if (currentSize > baos.size())
+ _fileHelper.writeFileSafely(_storeFile.toPath(), new BaseAction<File, IOException>()
{
- channel.truncate(baos.size());
- }
+ @Override
+ public void performAction(File file) throws IOException
+ {
+ _objectMapper.writeValue(file, _preferences);
+ }
+ });
}
catch (IOException e)
{
@@ -569,5 +536,32 @@ public class FileSystemPreferencesProvid
}
}
+ private void getFileLock(String lockFilePath)
+ {
+ File lockFile = new File(lockFilePath);
+ try
+ {
+ lockFile.createNewFile();
+ lockFile.deleteOnExit();
+
+ @SuppressWarnings("resource")
+ FileOutputStream out = new FileOutputStream(lockFile);
+ FileChannel channel = out.getChannel();
+ _storeLock = channel.tryLock();
+ }
+ catch (IOException ioe)
+ {
+ throw new IllegalStateException("Cannot create the lock file " + lockFile.getName(), ioe);
+ }
+ catch(OverlappingFileLockException e)
+ {
+ _storeLock = null;
+ }
+
+ if(_storeLock == null)
+ {
+ throw new IllegalStateException("Cannot get lock on file " + lockFile.getAbsolutePath() + ". Is another instance running?");
+ }
+ }
}
}
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java Tue Feb 24 13:08:04 2015
@@ -22,6 +22,8 @@ package org.apache.qpid.server.security.
import org.apache.log4j.Logger;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.server.util.BaseAction;
+import org.apache.qpid.server.util.FileHelper;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.AccountNotFoundException;
@@ -36,7 +38,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Random;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Pattern;
@@ -45,9 +46,9 @@ public abstract class AbstractPasswordFi
protected static final String DEFAULT_ENCODING = "utf-8";
private final Pattern _regexp = Pattern.compile(":");
- private final Map<String, U> _userMap = new HashMap<String, U>();
+ private final Map<String, U> _userMap = new HashMap<>();
private final ReentrantLock _userUpdate = new ReentrantLock();
- private final Random _random = new Random();
+ private final FileHelper _fileHelper = new FileHelper();
private File _passwordFile;
public final void open(File passwordFile) throws IOException
@@ -181,7 +182,7 @@ public abstract class AbstractPasswordFi
try
{
_userUpdate.lock();
- final Map<String, U> newUserMap = new HashMap<String, U>();
+ final Map<String, U> newUserMap = new HashMap<>();
BufferedReader reader = null;
try
@@ -224,71 +225,33 @@ public abstract class AbstractPasswordFi
protected abstract Logger getLogger();
- protected File createTempFileOnSameFilesystem()
- {
- File liveFile = _passwordFile;
- File tmp;
-
- do
- {
- tmp = new File(liveFile.getPath() + _random.nextInt() + ".tmp");
- }
- while(tmp.exists());
- tmp.deleteOnExit();
- return tmp;
- }
-
- protected void swapTempFileToLive(final File temp) throws IOException
+ protected void savePasswordFile() throws IOException
{
- File live = _passwordFile;
- // Remove any existing ".old" file
- final File old = new File(live.getAbsoluteFile() + ".old");
- if (old.exists())
+ try
{
- old.delete();
- }
+ _userUpdate.lock();
- // Create an new ".old" file
- if(!live.renameTo(old))
- {
- //unable to rename the existing file to the backup name
- getLogger().error("Could not backup the existing password file");
- throw new IOException("Could not backup the existing password file");
+ _fileHelper.writeFileSafely(_passwordFile.toPath(), new BaseAction<File,IOException>()
+ {
+ @Override
+ public void performAction(File file) throws IOException
+ {
+ writeToFile(file);
+ }
+ });
}
-
- // Move temp file to be the new "live" file
- if(!temp.renameTo(live))
+ finally
{
- //failed to rename the new file to the required filename
- if(!old.renameTo(live))
- {
- //unable to return the backup to required filename
- getLogger().error(
- "Could not rename the new password file into place, and unable to restore original file");
- throw new IOException("Could not rename the new password file into place, and unable to restore original file");
- }
-
- getLogger().error("Could not rename the new password file into place");
- throw new IOException("Could not rename the new password file into place");
+ _userUpdate.unlock();
}
}
- protected void savePasswordFile() throws IOException
+ private void writeToFile(File tmp) throws IOException
{
- try
- {
- _userUpdate.lock();
-
- BufferedReader reader = null;
- PrintStream writer = null;
-
- File tmp = createTempFileOnSameFilesystem();
-
- try
+ try(PrintStream writer = new PrintStream(tmp);
+ BufferedReader reader = new BufferedReader(new FileReader(_passwordFile)))
{
- writer = new PrintStream(tmp);
- reader = new BufferedReader(new FileReader(_passwordFile));
String line;
while ((line = reader.readLine()) != null)
@@ -346,32 +309,6 @@ public abstract class AbstractPasswordFi
getLogger().error("Unable to create the new password file: " + e);
throw new IOException("Unable to create the new password file",e);
}
- finally
- {
-
- try
- {
- if (reader != null)
- {
- reader.close();
- }
- }
- finally
- {
- if (writer != null)
- {
- writer.close();
- }
- }
-
- }
-
- swapTempFileToLive(tmp);
- }
- finally
- {
- _userUpdate.unlock();
- }
}
protected abstract U createUserFromPassword(Principal principal, char[] passwd);
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java Tue Feb 24 13:08:04 2015
@@ -23,6 +23,8 @@ package org.apache.qpid.server.security.
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.security.AccessControlException;
import java.security.Principal;
import java.util.Collection;
@@ -40,6 +42,7 @@ import javax.security.sasl.SaslServer;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Broker;
@@ -56,6 +59,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
+import org.apache.qpid.server.util.FileHelper;
public abstract class PrincipalDatabaseAuthenticationManager<T extends PrincipalDatabaseAuthenticationManager<T>>
extends AbstractAuthenticationManager<T>
@@ -96,7 +100,11 @@ public abstract class PrincipalDatabaseA
{
try
{
- passwordFile.createNewFile();
+ Path path = new FileHelper().createNewFile(passwordFile, getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS));
+ if (!Files.exists(path))
+ {
+ throw new IllegalConfigurationException(String.format("Cannot create password file at '%s'", _path));
+ }
}
catch (IOException e)
{
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java Tue Feb 24 13:08:04 2015
@@ -34,6 +34,8 @@ import java.util.concurrent.ConcurrentSk
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.util.BaseAction;
+import org.apache.qpid.server.util.FileHelper;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
/**
@@ -232,9 +234,9 @@ public class FileGroupDatabase implement
}
}
- private synchronized void writeGroupFile(String groupFile) throws IOException
+ private synchronized void writeGroupFile(final String groupFile) throws IOException
{
- Properties propertiesFile = new Properties();
+ final Properties propertiesFile = new Properties();
for (String group : _groupToUserMap.keySet())
{
@@ -244,19 +246,19 @@ public class FileGroupDatabase implement
propertiesFile.setProperty(group + ".users", userList);
}
- String comment = "Written " + new Date();
- FileOutputStream fileOutputStream = new FileOutputStream(groupFile);
- try
- {
- propertiesFile.store(fileOutputStream, comment);
- }
- finally
+
+ new FileHelper().writeFileSafely(new File(groupFile).toPath(), new BaseAction<File, IOException>()
{
- if(fileOutputStream != null)
+ @Override
+ public void performAction(File file) throws IOException
{
- fileOutputStream.close();
+ String comment = "Written " + new Date();
+ try(FileOutputStream fileOutputStream = new FileOutputStream(file))
+ {
+ propertiesFile.store(fileOutputStream, comment);
+ }
}
- }
+ });
}
private void validatePropertyNameIsGroupName(String propertyName)
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java Tue Feb 24 13:08:04 2015
@@ -27,6 +27,8 @@ import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -40,6 +42,9 @@ import java.util.Map;
import java.util.UUID;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.configuration.BrokerProperties;
+import org.apache.qpid.server.util.BaseAction;
+import org.apache.qpid.server.util.FileHelper;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.Version;
@@ -85,6 +90,7 @@ public class JsonFileConfigStore impleme
private final Map<String, List<UUID>> _idsByType = new HashMap<String, List<UUID>>();
private final ObjectMapper _objectMapper = new ObjectMapper();
private final Class<? extends ConfiguredObject> _rootClass;
+ private final FileHelper _fileHelper;
private Map<String,Class<? extends ConfiguredObject>> _classNameMapping;
private String _directoryName;
@@ -123,6 +129,7 @@ public class JsonFileConfigStore impleme
_objectMapper.registerModule(_module);
_objectMapper.enable(SerializationConfig.Feature.INDENT_OUTPUT);
_rootClass = rootClass;
+ _fileHelper = new FileHelper();
}
@Override
@@ -173,7 +180,7 @@ public class JsonFileConfigStore impleme
_directoryName = fileFromSettings.getParent();
_configFileName = fileFromSettings.getName();
_backupFileName = fileFromSettings.getName() + ".bak";
- _tempFileName = fileFromSettings.getName() + ".tmp";;
+ _tempFileName = fileFromSettings.getName() + ".tmp";
_lockFileName = fileFromSettings.getName() + ".lck";
}
@@ -191,56 +198,45 @@ public class JsonFileConfigStore impleme
checkDirectoryIsWritable(_directoryName);
getFileLock();
- if(!fileExists(_configFileName))
+ Path storeFile = new File(_directoryName, _configFileName).toPath();
+ Path backupFile = new File(_directoryName, _backupFileName).toPath();
+ if(!Files.exists(storeFile))
{
- if(!fileExists(_backupFileName))
+ if(!Files.exists(backupFile))
{
- File newFile = new File(_directoryName, _configFileName);
try
{
- _objectMapper.writeValue(newFile, Collections.emptyMap());
+ String posixFileAttributes = _parent.getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS);
+ storeFile = _fileHelper.createNewFile(storeFile, posixFileAttributes);
+ _objectMapper.writeValue(storeFile.toFile(), Collections.emptyMap());
}
catch (IOException e)
{
- throw new StoreException("Could not write configuration file " + newFile, e);
+ throw new StoreException("Could not write configuration file " + storeFile, e);
}
}
else
{
- renameFile(_backupFileName, _configFileName);
+ try
+ {
+ _fileHelper.atomicFileMoveOrReplace(backupFile, storeFile);
+ }
+ catch (IOException e)
+ {
+ throw new StoreException("Could not move backup to configuration file " + storeFile, e);
+ }
}
}
- deleteFileIfExists(_backupFileName);
- }
- private void renameFile(String fromFileName, String toFileName)
- {
- File toFile = deleteFileIfExists(toFileName);
- File fromFile = new File(_directoryName, fromFileName);
-
- if(!fromFile.renameTo(toFile))
+ try
{
- throw new StoreException("Cannot rename file " + fromFile.getAbsolutePath() + " to " + toFile.getAbsolutePath());
+ Files.deleteIfExists(backupFile);
}
- }
-
- private File deleteFileIfExists(final String toFileName)
- {
- File toFile = new File(_directoryName, toFileName);
- if(toFile.exists())
+ catch (IOException e)
{
- if(!toFile.delete())
- {
- throw new StoreException("Cannot delete file " + toFile.getAbsolutePath());
- }
+ throw new StoreException("Could not delete backup file " + backupFile, e);
}
- return toFile;
- }
- private boolean fileExists(String fileName)
- {
- File file = new File(_directoryName, fileName);
- return file.exists();
}
private void getFileLock()
@@ -396,7 +392,7 @@ public class JsonFileConfigStore impleme
private void save()
{
UUID rootId = getRootId();
- Map<String, Object> data = null;
+ final Map<String, Object> data;
if (rootId == null)
{
@@ -409,15 +405,18 @@ public class JsonFileConfigStore impleme
try
{
- deleteFileIfExists(_tempFileName);
- deleteFileIfExists(_backupFileName);
-
- File tmpFile = new File(_directoryName, _tempFileName);
- _objectMapper.writeValue(tmpFile, data);
- renameFile(_configFileName, _backupFileName);
- renameFile(tmpFile.getName(),_configFileName);
- tmpFile.delete();
- deleteFileIfExists(_backupFileName);
+ Path tmpFile = new File(_directoryName, _tempFileName).toPath();
+ _fileHelper.writeFileSafely( new File(_directoryName, _configFileName).toPath(),
+ new File(_directoryName, _backupFileName).toPath(),
+ tmpFile,
+ new BaseAction<File, IOException>()
+ {
+ @Override
+ public void performAction(File file) throws IOException
+ {
+ _objectMapper.writeValue(file, data);
+ }
+ });
}
catch (IOException e)
{
Modified: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/Action.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/Action.java?rev=1661931&r1=1661930&r2=1661931&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/Action.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/Action.java Tue Feb 24 13:08:04 2015
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.util;
-public interface Action<T>
+public interface Action<T> extends BaseAction<T, RuntimeException>
{
void performAction(T object);
}
Copied: qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java (from r1661162, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java)
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java?p2=qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java&p1=qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java&r1=1661162&r2=1661931&rev=1661931&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java (original)
+++ qpid/branches/0.32/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/FileHelper.java Tue Feb 24 13:08:04 2015
@@ -125,7 +125,8 @@ public class FileHelper
}
else
{
- throw new RuntimeException("Atomic move is unsupported and rename failed");
+ throw new RuntimeException("Atomic move is unsupported and rename from : '"
+ + sourceFile + "' to: '" + targetFile + "' failed.");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org