Skip to content

Commit

Permalink
Fix NoMethodError when visiting the /config page
Browse files Browse the repository at this point in the history
Fix session secret generation

Fix typo
  • Loading branch information
Joe-Klauza committed Jul 21, 2023
1 parent 4aece77 commit b7a8f5b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 4 deletions.
4 changes: 4 additions & 0 deletions admin-interface/docroot/public/custom/custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,10 @@ function setMutatorCount() {
$('#mutator-count').html(size);
}

function generateSessionSecret(element) {
$.get('/generate-session-secret', (password) => { $(element).val(password); });
}

function generatePassword(element) {
$.get('/generate-password', (password) => { $(element).val(password); });
}
Expand Down
2 changes: 1 addition & 1 deletion admin-interface/docroot/views/wrapper-config.erb
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<input id="admin_interface_session_secret" type="text" class="form-control blur" placeholder="<%= @config['admin_interface_session_secret'] %>">
</div>
<div class="p-2 col-2 d-flex justify-content-start">
<button type="button" class="btn btn-sm btn-outline-warning horizontal-expand mx-1" onclick="generatePassword('#admin_interface_session_secret');">Generate</button>
<button type="button" class="btn btn-sm btn-outline-warning horizontal-expand mx-1" onclick="generateSessionSecret('#admin_interface_session_secret');">Generate</button>
<button id="admin_interface_session_secret_revealer" type="button" class="btn btn-sm btn-success horizontal-expand mr-4" onclick="revealHide('#admin_interface_session_secret', '#admin_interface_session_secret_revealer');">Reveal</button>
</div>
<div class="p-2 col-4">
Expand Down
5 changes: 3 additions & 2 deletions admin-interface/lib/config-handler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,11 @@ def write_config
end

def init_server_config_files(config_id=nil)
# Map server_configs to their id keys
config_ids = @server_configs.values.map { |c| c['id'] }
# Either init all IDs or the desired ID
config_ids = config_id.nil? ? config_ids : [config_id]
config_ids.reject{ |id| !config_ids.include?(id) }.each do |config_id|
config_id = @server_configs[config_id]['id']
config_ids.each do |config_id|
CONFIG_FILES.values.each do |it|
[ERB.new(it[:local_erb]).result(binding), it[:actual], it[:actual_erb] && ERB.new(it[:actual_erb]).result(binding)].each do |path|
next if path.nil?
Expand Down
2 changes: 1 addition & 1 deletion admin-interface/lib/server-updater.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def get_latest_build_id
json = JSON.parse "{#{converted}}"
build_id = json.dig('581330', 'depots', 'branches', 'public', 'buildid')
if build_id.nil?
log "Unable to get build ID fron converted JSON. See log file for debug information.", level: :warn
log "Unable to get build ID from converted JSON. See log file for debug information.", level: :warn
log "SteamCMD STDOUT: #{stdout}\nSteamCMD STDERR: #{stderr}"
log "Converted JSON: #{json}"
return nil
Expand Down
4 changes: 4 additions & 0 deletions admin-interface/lib/webapp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1275,6 +1275,10 @@ def redirect_to_config(config_id, path)
end
end

get '/generate-session-secret', auth: :host do
SecureRandom.hex(32)
end

get '/generate-password', auth: :admin do
ConfigHandler.generate_password
end
Expand Down

0 comments on commit b7a8f5b

Please sign in to comment.