update: changed LinuxTerminal to OSTerminal

ITP-Cloud · Oct 24, 2023 · f21e851 · f21e851
1 parent fb67891
commit f21e851
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 32 deletions.
diff --git a/src/main/java/org/itp/engine/database/DatabaseServerController.java b/src/main/java/org/itp/engine/database/DatabaseServerController.java
@@ -63,7 +63,7 @@ public ResponseEntity<ApiResponse> deleteDatabaseUser(@RequestBody UserAccount u
     @PostMapping("database/new")
     public ResponseEntity<ApiResponse> createDatabase(@RequestBody Database database){
 
-        this.service.createDB(database);
+        this.service.createDb(database);
 
         ApiResponse response = new ApiResponse(
                 "Database successfully created",
@@ -76,7 +76,7 @@ public ResponseEntity<ApiResponse> createDatabase(@RequestBody Database database
     @PostMapping("database/delete")
     public ResponseEntity<ApiResponse> deleteDatabase(@RequestBody Database database){
 
-        this.service.dropDB(database);
+        this.service.dropDb(database);
 
         ApiResponse response = new ApiResponse(
                 "Database successfully dropped",

diff --git a/src/main/java/org/itp/engine/database/DatabaseServerService.java b/src/main/java/org/itp/engine/database/DatabaseServerService.java
@@ -1,8 +1,8 @@
 package org.itp.engine.database;
 
-import org.itp.engine.linuxos.LinuxTerminal;
-import org.itp.engine.linuxos.TerminalOperationSession;
-import org.itp.engine.linuxos.TerminalOperationSessionFactory;
+import org.itp.engine.osutils.OSTerminal;
+import org.itp.engine.osutils.TerminalOperationSession;
+import org.itp.engine.osutils.TerminalOperationSessionFactory;
 import org.itp.engine.useraccount.UserAccount;
 import org.springframework.stereotype.Service;
 
@@ -19,7 +19,7 @@ public boolean createDbAccount(UserAccount user) {
                 .addUserInput("exit")
                 .addUserInput("");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         terminal.executeSession();
 
@@ -34,7 +34,7 @@ public boolean updateDbAccount(UserAccount user) {
                 .addUserInput("ALTER USER '" + user.getDbUsername() + "'@'localhost' IDENTIFIED WITH caching_sha2_password BY '" + user.getDbUsername() + "';")
                 .addUserInput("exit;");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         terminal.executeSession();
 
@@ -51,38 +51,38 @@ public boolean deleteDbAccount(UserAccount user) {
                 .addUserInput("DROP USER '" + user.getDbUsername() + "'@'localhost';")
                 .addUserInput("exit;");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         System.out.println(terminal.executeSession());
 
         return true;
     }
 
-    public boolean createDB(Database database) {
+    public boolean createDb(Database database) {
         TerminalOperationSession session = TerminalOperationSessionFactory
                 .getSessionWith("mysql");
 
         session
-                .addUserInput("CREATE DATABASE "+database.getDatabaseName()+";")
+                .addUserInput("CREATE DATABASE " + database.getDatabaseName() + ";")
                 .addUserInput("exit;")
                 .addUserInput("");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         terminal.executeSession();
 
         return true;
     }
 
-    public boolean dropDB(Database database) {
+    public boolean dropDb(Database database) {
         TerminalOperationSession session = TerminalOperationSessionFactory
                 .getSessionWith("mysql");
 
         session
                 .addUserInput("DROP DATABASE " + database.getDatabaseName() + ";")
                 .addUserInput("exit;");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         terminal.executeSession();
 

diff --git a/src/main/java/org/itp/engine/ftp/FtpServerService.java b/src/main/java/org/itp/engine/ftp/FtpServerService.java
@@ -1,8 +1,8 @@
 package org.itp.engine.ftp;
 
-import org.itp.engine.linuxos.LinuxTerminal;
-import org.itp.engine.linuxos.TerminalOperationSession;
-import org.itp.engine.linuxos.TerminalOperationSessionFactory;
+import org.itp.engine.osutils.OSTerminal;
+import org.itp.engine.osutils.TerminalOperationSession;
+import org.itp.engine.osutils.TerminalOperationSessionFactory;
 import org.itp.engine.useraccount.UserAccount;
 import org.springframework.stereotype.Service;
 
@@ -48,7 +48,7 @@ public boolean createFtpAccount(UserAccount user){
                 // Step 10: Cleanup
                 .addUserInput("systemctl restart vsftpd");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         System.out.println(terminal.executeSession());
 

diff --git a/...org/itp/engine/linuxos/LinuxTerminal.java → ...va/org/itp/engine/osutils/OSTerminal.java b/...org/itp/engine/linuxos/LinuxTerminal.java → ...va/org/itp/engine/osutils/OSTerminal.java
@@ -1,13 +1,13 @@
-package org.itp.engine.linuxos;
+package org.itp.engine.osutils;
 import java.io.*;
 import java.util.List;
 
-public class LinuxTerminal {
+public class OSTerminal {
 
     private TerminalOperationSession session;
     private StringBuilder sessionOutput;
 
-    public LinuxTerminal() {
+    public OSTerminal() {
         this.sessionOutput = new StringBuilder();
     }
 

diff --git a/...ine/linuxos/TerminalOperationSession.java → ...ine/osutils/TerminalOperationSession.java b/...ine/linuxos/TerminalOperationSession.java → ...ine/osutils/TerminalOperationSession.java
@@ -1,12 +1,12 @@
-package org.itp.engine.linuxos;
+package org.itp.engine.osutils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class TerminalOperationSession {
 
     private String initialCommand;
-    private List<String> userInputs;
+    private final List<String> userInputs;
 
     public TerminalOperationSession() {
         this.initialCommand = "";

diff --git a/...uxos/TerminalOperationSessionFactory.java → ...tils/TerminalOperationSessionFactory.java b/...uxos/TerminalOperationSessionFactory.java → ...tils/TerminalOperationSessionFactory.java
@@ -1,4 +1,4 @@
-package org.itp.engine.linuxos;
+package org.itp.engine.osutils;
 
 public class TerminalOperationSessionFactory {
     public static TerminalOperationSession getSessionWith(String initialCommand){

diff --git a/src/main/java/org/itp/engine/useraccount/UserAccountService.java b/src/main/java/org/itp/engine/useraccount/UserAccountService.java
@@ -1,8 +1,8 @@
 package org.itp.engine.useraccount;
 
-import org.itp.engine.linuxos.LinuxTerminal;
-import org.itp.engine.linuxos.TerminalOperationSession;
-import org.itp.engine.linuxos.TerminalOperationSessionFactory;
+import org.itp.engine.osutils.OSTerminal;
+import org.itp.engine.osutils.TerminalOperationSession;
+import org.itp.engine.osutils.TerminalOperationSessionFactory;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -22,7 +22,7 @@ public boolean createUser(UserAccount user){
                 .addUserInput("")
                 .addUserInput("Y");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         String output = terminal.executeSession();
 
@@ -39,7 +39,7 @@ public boolean deleteUser(UserAccount user) {
                 .addUserInput("systemctl restart vsftpd")
                 .addUserInput("systemctl reload apache2");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         terminal.executeSession();
 

diff --git a/src/main/java/org/itp/engine/website/WebsiteService.java b/src/main/java/org/itp/engine/website/WebsiteService.java
@@ -1,8 +1,8 @@
 package org.itp.engine.website;
 
-import org.itp.engine.linuxos.LinuxTerminal;
-import org.itp.engine.linuxos.TerminalOperationSession;
-import org.itp.engine.linuxos.TerminalOperationSessionFactory;
+import org.itp.engine.osutils.OSTerminal;
+import org.itp.engine.osutils.TerminalOperationSession;
+import org.itp.engine.osutils.TerminalOperationSessionFactory;
 import org.springframework.stereotype.Service;
 
 import java.io.FileWriter;
@@ -50,9 +50,31 @@ public void createWebsite(Website website) {
                 // Step 8: Reload apache
                 .addUserInput("systemctl reload apache2");
 
-        LinuxTerminal terminal = new LinuxTerminal();
+        OSTerminal terminal = new OSTerminal();
         terminal.setSession(session);
         terminal.executeSession();
 
     }
+
+    // TODO: Implement delete website
+//    public void deleteWebsite(Website website){
+//        TerminalOperationSession session = TerminalOperationSessionFactory
+//                .getSessionWith("bash");
+//        session
+//                // Step 2: Create Website Folder
+//                .addUserInput("rm -r " + website.getWebsiteAbsolutePath())
+//
+//                // Step 5: Allow traffic through designated port
+//                .addUserInput("ufw allow " + website.getPortNumber())
+//                // Step 6: Add port to apache ports as well
+//                .addUserInput("echo \"Listen " + website.getPortNumber() + "\" | sudo tee -a /etc/apache2/ports.conf")
+//                // Step 7: Activate vhost
+//                .addUserInput("a2dissite " + website.getVhostIdentifier() + ".conf")
+//                // Step 8: Reload apache
+//                .addUserInput("systemctl reload apache2");
+//
+//        OSTerminal terminal = new OSTerminal();
+//        terminal.setSession(session);
+//        terminal.executeSession();
+//    }
 }