summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2022-05-06 18:25:22 +0200
committerGeorg Pfuetzenreuter2022-05-06 18:25:22 +0200
commit20d049ea10c14eb335014b5c8d150f55bf437377 (patch)
treeb0f1fdef1a3ef7c3700c68349de9e50a9468531c /src/main/java
parent65688954c9f4a0393d58c695c12712707f47c527 (diff)
downloadpubsh-web-20d049ea10c14eb335014b5c8d150f55bf437377.tar.gz
pubsh-web-20d049ea10c14eb335014b5c8d150f55bf437377.tar.bz2
pubsh-web-20d049ea10c14eb335014b5c8d150f55bf437377.zip
Checkpoint
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/libertacasa/pubsh/web/API.java5
-rw-r--r--src/main/java/net/libertacasa/pubsh/web/Docker.java17
-rw-r--r--src/main/java/net/libertacasa/pubsh/web/WebApplication.java40
3 files changed, 60 insertions, 2 deletions
diff --git a/src/main/java/net/libertacasa/pubsh/web/API.java b/src/main/java/net/libertacasa/pubsh/web/API.java
index 501fbc6..d14197e 100644
--- a/src/main/java/net/libertacasa/pubsh/web/API.java
+++ b/src/main/java/net/libertacasa/pubsh/web/API.java
@@ -14,13 +14,16 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Random;
@RestController
public class API {
@GetMapping("/hello")
public String hello(@RequestParam(value = "name", defaultValue = "World") String name) {
- return String.format("Hello %s!", name);
+ Random rand = new Random();
+ Integer randomInt = rand.nextInt(100-10);
+ return String.format("Hello %s! Your random number is %s!", name, randomInt);
}
@DeleteMapping("/backend/container/delete/{id}")
diff --git a/src/main/java/net/libertacasa/pubsh/web/Docker.java b/src/main/java/net/libertacasa/pubsh/web/Docker.java
index 536a80e..1460bb3 100644
--- a/src/main/java/net/libertacasa/pubsh/web/Docker.java
+++ b/src/main/java/net/libertacasa/pubsh/web/Docker.java
@@ -1,11 +1,15 @@
package net.libertacasa.pubsh.web;
+import java.io.File;
import java.time.Duration;
import java.util.Arrays;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.BuildImageResultCallback;
import com.github.dockerjava.api.command.InspectExecResponse.Container;
import com.github.dockerjava.api.command.ListContainersCmd;
import com.github.dockerjava.api.model.Image;
@@ -77,4 +81,17 @@ public class Docker {
dockerClient.removeContainerCmd(id).exec();
}
+ public static String buildImage(String targetUser, String osChoice, Integer count) {
+ String dockerfile = "classpath:docker/Dockerfile-" + osChoice;
+ String tag = targetUser + ":sh" + count;
+ Set<String> tags = new HashSet<String>();
+ tags.add(tag);
+ String imgid = dockerClient.buildImageCmd()
+ .withDockerfile(new File(dockerfile))
+ .withPull(false).withNoCache(false).withTags(tags)
+ .exec(new BuildImageResultCallback()).awaitImageId();
+
+ return(imgid);
+ }
+
}
diff --git a/src/main/java/net/libertacasa/pubsh/web/WebApplication.java b/src/main/java/net/libertacasa/pubsh/web/WebApplication.java
index faef657..ca6ea7e 100644
--- a/src/main/java/net/libertacasa/pubsh/web/WebApplication.java
+++ b/src/main/java/net/libertacasa/pubsh/web/WebApplication.java
@@ -1,6 +1,7 @@
package net.libertacasa.pubsh.web;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -21,12 +22,15 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.DeleteMapping;
//import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
//import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.github.dockerjava.api.model.Container;
import com.github.dockerjava.api.model.Image;
+import java.util.Random;
@SpringBootApplication
@@ -81,7 +85,17 @@ public class WebApplication {
//System.out.println(containers);
model.addAttribute("docker_images", images);
- model.addAttribute("docker_containers", containers);
+ model.addAttribute("docker_containers", containers);
+
+ ArrayList<String> availableOs = new ArrayList<String>();
+ availableOs.add("archlinux");
+ availableOs.add("opensuse-leap");
+ availableOs.add("opensuse-tumbleweed");
+ availableOs.add("ubuntu");
+ model.addAttribute("availableOs", availableOs);
+ model.addAttribute("osChoice", new String());
+
+
return("portal");
}
@@ -104,6 +118,30 @@ public class WebApplication {
return("redirect:/portal");
}
+ @PostMapping("/frontend/container/add")
+ public static String addContainer(@PathVariable String osChoice, HttpServletRequest request, Model model) {
+ KeycloakAuthenticationToken principal = (KeycloakAuthenticationToken) request.getUserPrincipal();
+ String username= null;
+ String userid = principal.getName();
+ IDToken token = principal.getAccount().getKeycloakSecurityContext().getIdToken();
+ Map<String, Object> customClaims = token.getOtherClaims();
+ username = String.valueOf(customClaims.get("username"));
+
+ model.addAttribute("osChoice", osChoice);
+
+
+ System.out.printf("New container with OS %s requested by %s (%s)", osChoice, userid, username);
+
+ Random rand = new Random();
+ Integer randomInt = rand.nextInt(9999999-1111);
+ Integer count = randomInt;
+
+ //Docker.buildImage(username, osChoice, count);
+
+
+ return("redirect:/portal");
+ }
+
@GetMapping(path = "/logout")
public String logout(HttpServletRequest request) throws ServletException {
request.logout();