tidy #249 jenkins

This commit is contained in:
Z. Cliffe Schreuders
2023-04-20 11:01:53 +01:00
parent 9ec9277d13
commit 2919b2cf31
4 changed files with 7 additions and 6 deletions

View File

@@ -8,7 +8,7 @@ class jenkins_cli::configure {
Exec { path => ['/bin', '/usr/bin', '/usr/local/bin', '/sbin', '/usr/sbin'] }
$user = $secgen_parameters['leaked_username'][0]
$user = $secgen_parameters['unix_username'][0]
$user_home = "/home/${user}"
# Create user

View File

@@ -5,7 +5,7 @@ class jenkins_cli::install {
Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ] }
$secgen_parameters = secgen_functions::get_parameters($::base64_inputs_file)
$user = $secgen_parameters['leaked_username'][0]
$user = $secgen_parameters['unix_username'][0]
$port = $secgen_parameters['port'][0]
$modulename = 'jenkins_cli'

View File

@@ -25,6 +25,7 @@
<read_fact>port</read_fact>
<read_fact>strings_to_leak</read_fact>
<read_fact>leaked_filenames</read_fact>
<read_fact>unix_username</read_fact>
<default_input into="port">
<generator module_path=".*/random_unregistered_port" />
@@ -38,8 +39,8 @@
<generator type="filename_generator"/>
</default_input>
<default_input into="leaked_username">
<generator type="username_generator" />
<default_input into="unix_username">
<value>jenkins</value>
</default_input>
<!--optional

View File

@@ -4,10 +4,10 @@ After=network.target
[Service]
Type=simple
User=<%= @leaked_username %>
User=<%= @user %>
ExecStart=/bin/sh -c "java -Djenkins.install.runSetupWizard=false -jar /usr/local/bin/jenkins.war --httpPort=<% @port %>"
Restart=on-abort
RestartSec=1
[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target