diff options
author | Simon Rettberg | 2015-05-04 19:12:39 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-05-04 19:12:39 +0200 |
commit | 4487a9dad97f8f004303eb74c48278fbb90e7a44 (patch) | |
tree | af2f4a9a37a0060fbf9aab845104433d0d0caf9c /src/main/java/org/openslx/taskmanager/tasks | |
parent | Add PortScan task (diff) | |
download | tmlite-bwlp-4487a9dad97f8f004303eb74c48278fbb90e7a44.tar.gz tmlite-bwlp-4487a9dad97f8f004303eb74c48278fbb90e7a44.tar.xz tmlite-bwlp-4487a9dad97f8f004303eb74c48278fbb90e7a44.zip |
Update CreateAdConfig to match new ldadp config format
Diffstat (limited to 'src/main/java/org/openslx/taskmanager/tasks')
5 files changed, 23 insertions, 12 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java b/src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java index a5b436f..33fae6e 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java +++ b/src/main/java/org/openslx/taskmanager/tasks/CompileIPxe.java @@ -123,7 +123,7 @@ public class CompileIPxe extends AbstractTask return false; } // Compile - if ( 0 != Exec.syncAt( "/opt/openslx/ipxe/src", "make", "EMBED=../ipxelinux.ipxe,../pxelinux.0", "bin/undionly.kkkpxe" ) ) { + if ( 0 != Exec.syncAt( 15, "/opt/openslx/ipxe/src", "make", "EMBED=../ipxelinux.ipxe,../pxelinux.0", "bin/undionly.kkkpxe" ) ) { status.error = "Compiling ipxelinux.0 failed"; return false; } diff --git a/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java b/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java index c07d337..ec34716 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java +++ b/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java @@ -36,7 +36,11 @@ public class CreateAdConfig extends AbstractTask @Expose private int proxyport = 0; @Expose + private int adport = 0; + @Expose private String home = null; + @Expose + private String fingerprint = ""; private Output status = new Output(); @@ -67,7 +71,7 @@ public class CreateAdConfig extends AbstractTask try { // Generate keys { - int ret = Exec.sync( "openssl", "req", + int ret = Exec.sync( 3, "openssl", "req", "-x509", "-new", "-newkey", "rsa:4096", "-keyout", keyFile, "-out", certFile, "-days", "5000", "-nodes", "-subj", "/C=DE/ST=Nowhere/L=Springfield/O=Dis/CN=" + this.proxyip ); if ( ret != 0 ) { @@ -81,8 +85,11 @@ public class CreateAdConfig extends AbstractTask + "binddn=%s\n" + "bindpw=%s\n" + "base=%s\n" - + "port=%s\n" + "home=%s\n" + + "port=%s\n" + + "fingerprint=%s\n" + + "[local]\n" + + "port=%s\n" + "cert=%s\n" + "privkey=%s\n" + "\n", @@ -90,8 +97,10 @@ public class CreateAdConfig extends AbstractTask this.binddn, this.bindpw, this.searchbase, - this.proxyport, this.home, + this.adport, + this.fingerprint, + this.proxyport, certFile, keyFile ); // Generic ldap config @@ -111,7 +120,7 @@ public class CreateAdConfig extends AbstractTask } try { FileUtils.writeStringToFile( new File( fileName ), ldadpConf, StandardCharsets.UTF_8 ); - if ( 0 != Exec.sync( + if ( 0 != Exec.sync( 3, "/usr/bin/sudo", "-n", "-u", "root", diff --git a/src/main/java/org/openslx/taskmanager/tasks/DownloadFile.java b/src/main/java/org/openslx/taskmanager/tasks/DownloadFile.java index 607ca9a..352aac5 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/DownloadFile.java +++ b/src/main/java/org/openslx/taskmanager/tasks/DownloadFile.java @@ -87,7 +87,7 @@ public class DownloadFile extends AbstractTask status.error = "Could not create temporary file for gpg signature"; return false; } - if ( 0 != Exec.sync( "gpg", "--verify", gpgTempFile.getAbsolutePath(), tmpFile.getAbsolutePath() ) ) { + if ( 0 != Exec.sync( 10, "gpg", "--verify", gpgTempFile.getAbsolutePath(), tmpFile.getAbsolutePath() ) ) { status.error = "GPG signature of downloaded file not valid!\n\n" + this.gpg; return false; } diff --git a/src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java b/src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java index e1fec55..ef0998c 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java +++ b/src/main/java/org/openslx/taskmanager/tasks/LdapSearch.java @@ -68,12 +68,14 @@ public class LdapSearch extends SystemCommandTask this.getDn = true; } + // As we don't care about the certificate here, you might want to put TLS_REQCERT never + // in /etc/ldap/ldap.conf return new String[] { "ldapsearch", "-x", // Simple auth "-LLL", // No additional stuff "-y", this.fifo, // Password from file - "-H", "ldap://" + this.server + ":3268/", // Host + "-H", this.server, // Host "-b", this.searchbase, // SB "-D", this.binddn, // DN "-l", "4", // Time limit in seconds diff --git a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java index 6324657..2250d84 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java +++ b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java @@ -46,7 +46,7 @@ public class LighttpdHttps extends AbstractTask private boolean createRandom() { - int ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--random", this.proxyip ); + int ret = Exec.sync( 5, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--random", this.proxyip ); if ( ret != 0 ) { status.error = "generator exited with code " + ret; return false; @@ -75,16 +75,16 @@ public class LighttpdHttps extends AbstractTask return false; } int ret; - ret = Exec.sync( "/opt/taskmanager/scripts/install-https", "--test", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); + ret = Exec.sync( 5, "/opt/taskmanager/scripts/install-https", "--test", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); if ( ret != 0 ) { status.error = "Given key and certificate do not match, or have invalid format (exit code: " + ret + ")"; return false; } if ( tmpChain != null ) { - ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath(), + ret = Exec.sync( 5, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath(), tmpChain.getAbsolutePath() ); } else { - ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); + ret = Exec.sync( 5, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); } if ( ret != 0 ) { status.error = "import exited with code " + ret; @@ -101,7 +101,7 @@ public class LighttpdHttps extends AbstractTask private boolean disableHttps() { - int ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--disable" ); + int ret = Exec.sync( 5, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--disable" ); if ( ret != 0 ) { status.error = "disable exited with code " + ret; return false; |