commit
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -33,3 +33,4 @@
|
|||||||
/cygnus-installer/src/test
|
/cygnus-installer/src/test
|
||||||
/cygnus-cloud-service/target
|
/cygnus-cloud-service/target
|
||||||
/cygnus-installer/src/target
|
/cygnus-installer/src/target
|
||||||
|
/cygnus-installer/target
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
,maddy,Narayanans-MacBook-Pro.local,27.07.2026 21:29,file:///Users/maddy/Library/Application%20Support/LibreOffice/4;
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
spring:
|
|
||||||
main:
|
|
||||||
banner-mode: "off"
|
|
||||||
application:
|
|
||||||
name: technobee-service-installer
|
|
||||||
technobee:
|
|
||||||
installer:
|
|
||||||
config: ${TECHNOBEE_INSTALLER_CONFIG:./installer.ini}
|
|
||||||
version: ${TECHNOBEE_INSTALLER_VERSION:1.0.0}
|
|
||||||
logging:
|
|
||||||
level:
|
|
||||||
root: WARN
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,3 +0,0 @@
|
|||||||
artifactId=technobee-service-installer
|
|
||||||
groupId=com.cygnus
|
|
||||||
version=1.0.0-SNAPSHOT
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
com/cygnus/installer/MachineAssertionService.class
|
|
||||||
com/cygnus/installer/ActivationDtos$ValidationResponse.class
|
|
||||||
com/cygnus/installer/SwingInstallationWizard$2.class
|
|
||||||
com/cygnus/installer/CommandResult.class
|
|
||||||
com/cygnus/installer/InstallationProgressListener.class
|
|
||||||
com/cygnus/installer/ProductProfileRegistry.class
|
|
||||||
com/cygnus/installer/InstallationRequest.class
|
|
||||||
com/cygnus/installer/InstallerConfiguration.class
|
|
||||||
com/cygnus/installer/ProductProfile.class
|
|
||||||
com/cygnus/installer/InstallationWizard.class
|
|
||||||
com/cygnus/installer/TechnobeeServiceInstallerApplication.class
|
|
||||||
com/cygnus/installer/DeploymentWriter.class
|
|
||||||
com/cygnus/installer/InstallationKeyService.class
|
|
||||||
com/cygnus/installer/DockerComposeDeploymentService.class
|
|
||||||
com/cygnus/installer/ActivationClient.class
|
|
||||||
com/cygnus/installer/ActivationDtos$RegistrationResponse.class
|
|
||||||
com/cygnus/installer/IniDocument.class
|
|
||||||
com/cygnus/installer/SwingInstallationWizard$3.class
|
|
||||||
com/cygnus/installer/InstallerConfigurationException.class
|
|
||||||
com/cygnus/installer/DockerRegistryLoginService.class
|
|
||||||
com/cygnus/installer/SwingInstallationWizard.class
|
|
||||||
com/cygnus/installer/ActivationDtos.class
|
|
||||||
com/cygnus/installer/DockerPrerequisiteChecker.class
|
|
||||||
com/cygnus/installer/InstallerBootstrapProperties.class
|
|
||||||
com/cygnus/installer/SwingInstallationWizard$1.class
|
|
||||||
com/cygnus/installer/CommandExecutor.class
|
|
||||||
com/cygnus/installer/IniConfigurationLoader.class
|
|
||||||
com/cygnus/installer/InstallationService.class
|
|
||||||
com/cygnus/installer/InstallationResult.class
|
|
||||||
com/cygnus/installer/RuntimeConfiguration.class
|
|
||||||
com/cygnus/installer/ActivationDtos$RegistrationRequest.class
|
|
||||||
com/cygnus/installer/ActivationDtos$ValidationRequest.class
|
|
||||||
com/cygnus/installer/PrerequisiteException.class
|
|
||||||
com/cygnus/installer/InstallerSettings.class
|
|
||||||
com/cygnus/installer/InstallationKeyPair.class
|
|
||||||
com/cygnus/installer/SwingInstallationWizard$ProgressUpdate.class
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/ActivationClient.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/ActivationDtos.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/CommandExecutor.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/CommandResult.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/DeploymentWriter.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/DockerComposeDeploymentService.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/DockerPrerequisiteChecker.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/DockerRegistryLoginService.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/IniConfigurationLoader.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/IniDocument.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallationKeyPair.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallationKeyService.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallationProgressListener.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallationRequest.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallationResult.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallationService.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallationWizard.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallerBootstrapProperties.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallerConfiguration.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallerConfigurationException.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/InstallerSettings.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/MachineAssertionService.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/PrerequisiteException.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/ProductProfile.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/ProductProfileRegistry.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/RuntimeConfiguration.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/SwingInstallationWizard.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/main/java/com/cygnus/installer/TechnobeeServiceInstallerApplication.java
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
com/cygnus/installer/MachineAssertionServiceTest.class
|
|
||||||
com/cygnus/installer/DockerRegistryLoginServiceTest$CapturingExecutor.class
|
|
||||||
com/cygnus/installer/DockerRegistryLoginServiceTest.class
|
|
||||||
com/cygnus/installer/DockerComposeDeploymentServiceTest$CapturingExecutor.class
|
|
||||||
com/cygnus/installer/InstallationServiceTest.class
|
|
||||||
com/cygnus/installer/DockerPrerequisiteCheckerTest$1.class
|
|
||||||
com/cygnus/installer/ProductProfileRegistryTest.class
|
|
||||||
com/cygnus/installer/IniConfigurationLoaderTest.class
|
|
||||||
com/cygnus/installer/DockerComposeDeploymentServiceTest.class
|
|
||||||
com/cygnus/installer/DeploymentWriterTest.class
|
|
||||||
com/cygnus/installer/DockerPrerequisiteCheckerTest.class
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/test/java/com/cygnus/installer/DeploymentWriterTest.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/test/java/com/cygnus/installer/DockerComposeDeploymentServiceTest.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/test/java/com/cygnus/installer/DockerPrerequisiteCheckerTest.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/test/java/com/cygnus/installer/DockerRegistryLoginServiceTest.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/test/java/com/cygnus/installer/IniConfigurationLoaderTest.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/test/java/com/cygnus/installer/InstallationServiceTest.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/test/java/com/cygnus/installer/MachineAssertionServiceTest.java
|
|
||||||
/Users/maddy/Projects/cygnus/matrix/cygnus-installer/src/test/java/com/cygnus/installer/ProductProfileRegistryTest.java
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: com.cygnus.installer.DeploymentWriterTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.174 s -- in com.cygnus.installer.DeploymentWriterTest
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: com.cygnus.installer.DockerComposeDeploymentServiceTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 s -- in com.cygnus.installer.DockerComposeDeploymentServiceTest
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: com.cygnus.installer.DockerPrerequisiteCheckerTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 s -- in com.cygnus.installer.DockerPrerequisiteCheckerTest
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: com.cygnus.installer.DockerRegistryLoginServiceTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.010 s -- in com.cygnus.installer.DockerRegistryLoginServiceTest
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: com.cygnus.installer.IniConfigurationLoaderTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 s -- in com.cygnus.installer.IniConfigurationLoaderTest
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: com.cygnus.installer.InstallationServiceTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 s -- in com.cygnus.installer.InstallationServiceTest
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: com.cygnus.installer.MachineAssertionServiceTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.570 s -- in com.cygnus.installer.MachineAssertionServiceTest
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
-------------------------------------------------------------------------------
|
|
||||||
Test set: com.cygnus.installer.ProductProfileRegistryTest
|
|
||||||
-------------------------------------------------------------------------------
|
|
||||||
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 s -- in com.cygnus.installer.ProductProfileRegistryTest
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,46 +1,45 @@
|
|||||||
package matrix.nimble.controller;
|
package matrix.nimble.controller;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import matrix.nimble.cloud.identity.CloudAuthenticationException;
|
import matrix.nimble.cloud.identity.CloudAuthenticationException;
|
||||||
import matrix.nimble.cloud.identity.CloudAuthenticationGateway;
|
import matrix.nimble.cloud.identity.CloudAuthenticationGateway;
|
||||||
import matrix.nimble.model.Login;
|
import matrix.nimble.model.Login;
|
||||||
import matrix.nimble.model.Session;
|
import matrix.nimble.model.Session;
|
||||||
|
|
||||||
//servlet libraries
|
//servlet libraries
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpSession;
|
import jakarta.servlet.http.HttpSession;
|
||||||
|
|
||||||
//spring libraries
|
//spring libraries
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.ModelMap;
|
import org.springframework.ui.ModelMap;
|
||||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||||
import org.springframework.web.bind.annotation.RequestHeader;
|
import org.springframework.web.bind.annotation.RequestMethod;
|
||||||
import org.springframework.web.bind.annotation.RequestMethod;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.SessionAttributes;
|
||||||
import org.springframework.web.bind.annotation.SessionAttributes;
|
|
||||||
|
@Controller
|
||||||
@Controller
|
@SessionAttributes("Sessvals")
|
||||||
@SessionAttributes("Sessvals")
|
|
||||||
public class SessionController {
|
public class SessionController {
|
||||||
private final CloudAuthenticationGateway cloudAuthenticationGateway;
|
private final CloudAuthenticationGateway cloudAuthenticationGateway;
|
||||||
|
|
||||||
public SessionController(CloudAuthenticationGateway cloudAuthenticationGateway) {
|
public SessionController(CloudAuthenticationGateway cloudAuthenticationGateway) {
|
||||||
this.cloudAuthenticationGateway = cloudAuthenticationGateway;
|
this.cloudAuthenticationGateway = cloudAuthenticationGateway;
|
||||||
}
|
}
|
||||||
@RequestMapping(value="login",method=RequestMethod.POST )
|
// @RequestMapping(value="login",method=RequestMethod.POST )
|
||||||
public String LoginPage(ModelMap model,@RequestHeader Map<String, String> headers)
|
// public String LoginPage(ModelMap model,@RequestHeader Map<String, String> headers)
|
||||||
{
|
// {
|
||||||
model.addAttribute("login", new Login());
|
// model.addAttribute("login", new Login());
|
||||||
String host = headers.get("host").toString();
|
// String host = headers.get("host").toString();
|
||||||
if(!host.contains("192.168.10.205:8585") &&
|
// if(!host.contains("192.168.10.205:8585") &&
|
||||||
!host.contains("192.168.10.250:8585") &&
|
// !host.contains("192.168.10.250:8585") &&
|
||||||
!host.startsWith("localhost:") && !host.startsWith("127.0.0.1:")) {
|
// !host.startsWith("localhost:") && !host.startsWith("127.0.0.1:")) {
|
||||||
return "error";
|
// return "error";
|
||||||
}
|
// }
|
||||||
return "login";
|
// return "login";
|
||||||
}
|
// }
|
||||||
@RequestMapping(value="logout",method=RequestMethod.POST )
|
@RequestMapping(value="logout",method=RequestMethod.POST )
|
||||||
public String LogoutPage(HttpServletRequest request, ModelMap model,@ModelAttribute(value="Sessvals") Session Sessvals)
|
public String LogoutPage(HttpServletRequest request, ModelMap model,@ModelAttribute(value="Sessvals") Session Sessvals)
|
||||||
{
|
{
|
||||||
HttpSession session = request.getSession(false);
|
HttpSession session = request.getSession(false);
|
||||||
@@ -69,17 +68,17 @@ public class SessionController {
|
|||||||
return "login";
|
return "login";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@RequestMapping(value="dashboard",method=RequestMethod.POST )
|
@RequestMapping(value="dashboard",method=RequestMethod.POST )
|
||||||
public String Dashboard(ModelMap model,HttpServletRequest request,@ModelAttribute(value="Sessvals") Session Sessvals)
|
public String Dashboard(ModelMap model,HttpServletRequest request,@ModelAttribute(value="Sessvals") Session Sessvals)
|
||||||
{
|
{
|
||||||
if(Sessvals == null)
|
if(Sessvals == null)
|
||||||
{
|
{
|
||||||
return "redirect:/logout";
|
return "redirect:/logout";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
model.addAttribute("Sessvals",Sessvals);
|
model.addAttribute("Sessvals",Sessvals);
|
||||||
return "dashboard";
|
return "dashboard";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user