spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

More sanitizing

pull/897/head
Rick Carlino 2018-06-25 14:59:12 -05:00
parent c413fd4075
commit 6799202f00
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mqtt/server.rb
View File

@ -1,5 +1,9 @@
require 'erb'
def needs_admin_password
raise "You must set an ADMIN_PASSWORD in application.yml."
end
puts "=== Retrieving container info"
DOCKER_IMG_NAME = "farmbot-mqtt"
IMG_IS_BUILT = `cd mqtt; sudo docker images`.include?(DOCKER_IMG_NAME)
@ -16,9 +20,10 @@ TEMPLATE = File.read(TEMPLATE_FILE)
RENDERER = ERB.new(TEMPLATE)
PROTO = ENV["FORCE_SSL"] ? "https:" : "http:"
VHOST = ENV.fetch("MQTT_VHOST") { "/" }
admin_password = ENV.fetch("ADMIN_PASSWORD") do
raise "You must set an ADMIN_PASSWORD in application.yml."
end
admin_password = ENV.fetch("ADMIN_PASSWORD") { needs_admin_password }.inspect
needs_admin_password if admin_password.length < 5
fully_formed_url = PROTO + $API_URL
if !ENV["API_HOST"] || !ENV["API_PORT"]