?

demo-website/new-project/index.js

@@ -75,7 +75,7 @@ function getMemberEmails() {
     var members = document.getElementById("member-list").getElementsByTagName("li");
     
     for(var i = 0; i < members.length; i++){
-        memberEmails.push(members[0].firstChild.data);
+        memberEmails.push(members[i].firstChild.data);
     }
     return memberEmails
 }

source/customLogger/__init__.py

 import logging
 from logging_loki import LokiHandler, emitter
-
 # for this is needed for the color level to work in grafana
 emitter.LokiEmitter.level_tag = "level"
 
@@ -11,8 +10,8 @@ handler = LokiHandler(
     version="1",
     )
 
-
 logger = logging.getLogger("ROSE_LOG")
+# At or above INFO will be logged 
 logger.setLevel(logging.INFO)
 logger.addHandler(handler)
 

source/orchestrationLogic/HEAT/bootup.ps1

 #ps1_sysnative
-Start-Sleep -s 600
 echo custom-script
+if( !(Test-Path -Path "C:\flag.txt")) {
+    New-Item -Path "C:\flag.txt"
+    echo "if"
 
     get-executionpolicy
     Set-ExecutionPolicy RemoteSigned -Force
@@ -20,12 +22,13 @@ $pw = ConvertTo-SecureString "Rosetest1" -AsPlainText -Force
     $usr = "$dc\Administrator"
     $creds = New-Object System.Management.Automation.PSCredential($usr,$pw)
 
+    $joined = $true
+    $i = 0;
     do {
         try {
         Add-Computer -DomainName $dc -Credential $creds -ErrorAction Stop
         echo "`n`n DOMAIN JOIN SUCCEEDED`n`n"
-    <RDPMembers>
-    exit 1001
+        exit 1003
 
         } catch {
         $joined = $false
@@ -33,4 +36,18 @@ do {
         echo "`n`n DOMAIN JOIN FAILED RETRYING IN 1 MINUTE `n`n"
         Start-Sleep -s 60
         }
-} while ((-Not $joined) -And ($i -lt 10))
\ No newline at end of file
+    } while ((-Not $joined) -And ($i -lt 25))
+
+}else {
+    $added = $true
+    $i = 0
+    do {
+        try{
+        <RDPMembers> # Adds users to the rdp member group
+        } catch{
+            $added = $false
+            $i = $i+1
+        }
+
+    } while($i -lt 10)
+}

source/orchestrationLogic/HEAT/dc-init.ps1

@@ -3,9 +3,9 @@ New-Item -Path "C:\test.txt"
 
 echo "kjort" >> C:\test.txt
 
-if( !(Test-Path -Path "C:\flag.txt")) {
+if( !(Test-Path -Path "C:\flag1.txt")) {
     echo "if"
-    New-Item -Path "C:\flag.txt"
+    New-Item -Path "C:\flag1.txt"
     # Use self as DNS
     Set-DNSClientServerAddress -InterfaceIndex (Get-NetAdapter).InterfaceIndex -ServerAddresses 127.0.0.1
     #Install ADDS
@@ -13,6 +13,13 @@ if( !(Test-Path -Path "C:\flag.txt")) {
     # Set Administrator password
     net user Administrator Rosetest1
     Import-Module ADDSDeployment
+    exit 1003
+    
+ 
+    
+}elseif(!(Test-Path -Path "C:\flag2.txt")){
+    echo "elseif"
+    New-Item -Path "C:\flag2.txt"
     $secureSafeModePwd = ConvertTo-SecureString "Rosetest1" -AsPlainText -Force
     # Setup domain
     Install-ADDSForest -DomainName "rose.local" `
@@ -20,15 +27,24 @@ if( !(Test-Path -Path "C:\flag.txt")) {
         -SafeModeAdministratorPassword $secureSafeModePwd `
         -InstallDns -NoRebootOnCompletion -force
     exit 1003
+
 }else {
     echo "else"
     New-Item -Path "C:\log.txt"
 
-    New-ADUser -Name "bojack" -Accountpassword (ConvertTo-SecureString "HorsemanPass1" -AsPlainText -Force ) -Enabled $true >> C:\log.txt
-    New-ADUser -Name "diane" -Accountpassword (ConvertTo-SecureString "NguyenPass1" -AsPlainText -Force ) -Enabled $true >> C:\log.txt
-    New-ADUser -Name "todd" -Accountpassword (ConvertTo-SecureString "ChavezPass1" -AsPlainText -Force ) -Enabled $true >> C:\log.txt
-    New-ADUser -Name "sarah" -Accountpassword (ConvertTo-SecureString "LynnPass1" -AsPlainText -Force ) -Enabled $true >> C:\log.txt
-    New-ADUser -Name "hollyhock" -Accountpassword (ConvertTo-SecureString "ManheimPass1" -AsPlainText -Force ) -Enabled $true >> C:\log.txt
-    New-ADUser -Name "wanda" -Accountpassword (ConvertTo-SecureString "PiercePass1" -AsPlainText -Force ) -Enabled $true >> C:\log.txt
-    New-ADUser -Name "pinky" -Accountpassword (ConvertTo-SecureString "PenguinPass1" -AsPlainText -Force ) -Enabled $true >> C:\log.txt
+    $dc = "rose.local"
+    $pw = ConvertTo-SecureString "Rosetest1" -AsPlainText -Force 
+    $usr = "$dc\Administrator"
+    $creds = New-Object System.Management.Automation.PSCredential($usr,$pw)
+
+
+    New-ADUser -Name "bojack" -Accountpassword (ConvertTo-SecureString "HorsemanPass1" -AsPlainText -Force ) -Enabled $true -Credential $creds
+    New-ADUser -Name "diane" -Accountpassword (ConvertTo-SecureString "NguyenPass1" -AsPlainText -Force ) -Enabled $true -Credential $creds
+    New-ADUser -Name "todd" -Accountpassword (ConvertTo-SecureString "ChavezPass1" -AsPlainText -Force ) -Enabled $true -Credential $creds
+    New-ADUser -Name "sarah" -Accountpassword (ConvertTo-SecureString "LynnPass1" -AsPlainText -Force ) -Enabled $true -Credential $credst
+    New-ADUser -Name "hollyhock" -Accountpassword (ConvertTo-SecureString "ManheimPass1" -AsPlainText -Force ) -Enabled $true -Credential $creds
+    New-ADUser -Name "wanda" -Accountpassword (ConvertTo-SecureString "PiercePass1" -AsPlainText -Force ) -Enabled $true -Credential $creds 
+    New-ADUser -Name "pinky" -Accountpassword (ConvertTo-SecureString "PenguinPass1" -AsPlainText -Force ) -Enabled $true -Credential $creds
+
+
 }

source/orchestrationLogic/orchestrator.py

@@ -157,6 +157,6 @@ class Orchestrator:
     def allowRDP(self, members):
         result = ''
         for member in members:
-            result += "Add-LocalGroupMember -Group 'Remote Desktop Users' -Member '{}';".format(member)
+            result += "Add-LocalGroupMember -Group 'Remote Desktop Users' -Member '{}' -ErrorAction Stop;".format(member)
         return result