Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-2161: <ldap-server> creates unique dir for embedded LDAP

Browse Source
This commit is contained in:
Rob Winch
2013-04-25 11:14:12 -05:00
parent dd554e1842
commit 407b08956b
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
View File

@@ -17,7 +17,6 @@ package org.springframework.security.ldap.server;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
@@ -119,7 +118,7 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life
String apacheWorkDir = System.getProperty("apacheDSWorkDir");
if (apacheWorkDir == null) {
apacheWorkDir = System.getProperty("java.io.tmpdir") + File.separator + "apacheds-spring-security";
apacheWorkDir = createTempDirectory("apacheds-spring-security-");
}
setWorkingDirectory(new File(apacheWorkDir));
@@ -267,6 +266,22 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life
}
}
private String createTempDirectory(String prefix) throws IOException {
String parentTempDir = System.getProperty("java.io.tmpdir");
String fileNamePrefix = prefix + System.nanoTime();
String fileName = fileNamePrefix;
for(int i=0;i<1000;i++) {
File tempDir = new File(parentTempDir, fileName);
if(!tempDir.exists()) {
return tempDir.getAbsolutePath();
}
fileName = fileNamePrefix + "~" + i;
}
throw new IOException("Failed to create a temporary directory for file at " + new File(parentTempDir, fileNamePrefix));
}
private boolean deleteDir(File dir) {
if (dir.isDirectory()) {
String[] children = dir.list();