bandshell 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f691eea3256e1bb34482ca43c354cdb4cbd1514
-  data.tar.gz: 5003147ec2c51c314ef5a81f299ab4305c8610a5
+  metadata.gz: 2989fd086430aa0b0d8c829cc7efa755d84dbc25
+  data.tar.gz: f57abc11dbec2c79dd7de4aba4a7a5a5e6bbb34e
 SHA512:
-  metadata.gz: a062d1067b2244260ef3420da36d560a02f80f32bea1e15531311f95f77e3d9f7542109827e652262320c11d2a755a568b5abfb200e0ef293a6e9f71dfcf6130
-  data.tar.gz: 57c865c44869c4f64efeb203b646969941ae176d4a1e2a67ec22dfad39405e2deefeec60d18bf6c5d5a61bb109f13ee321145bd999a8412190070aeea0ebb8c2
+  metadata.gz: 95285d42380570c16207b27b9c2e097d5bf30dd98d8c55675007d7c2680be6ea62f891d010c18f5be61da1312b5ea66b5a1fe038d9e6080f51d19226ac79b87b
+  data.tar.gz: e70736faa3d57667f15ffa9e5a6aa0dd0dc0b64e4064e15a209306b0c055a3046196eea2db1aa1bd43ce62c3cac3de28f841a28dc1f689e1c827517114a08654

data/bin/bandshell-timer.rb

@@ -5,6 +5,7 @@
 # Periodically ping the bandshell web app so that background tasks
 # may be performed. Called by bandshelld as a daemon.
 require "net/http"
+require 'bandshell/config_store'
 
 def linestamp
   "bandshell-timer.rb ("+Time.now.to_s+"): "
@@ -21,9 +22,15 @@ end
 puts linestamp + "connecting to bandshell at " + BandshellURL
 
 StatusURI = URI.parse(BandshellURL+"/background-job")
-  
+
 loop do
   sleep(5)
+  #if a system password is stored as a config, we need to restart bandshelld
+  #to execute chpasswd and clear that config
+  if Bandshell::ConfigStore.config_exists?('system_password')
+    system("bandshelld restart")
+  end
+
   begin
     response = Net::HTTP.get_response(StatusURI)
   rescue Errno::ECONNREFUSED

data/bin/bandshelld

@@ -5,6 +5,19 @@
 require "rubygems"
 require "daemons"
 require "bandshell/application/app"
+require 'bandshell/config_store'
+
+#if the password has not been changed before during initial setup,
+#read a new one and change passwords accordingly
+unless Bandshell::ConfigStore.config_exists?('system_passwords_changed')
+  system_password = Bandshell::ConfigStore.read_config('system_password', '')
+  unless system_password.empty?
+    system("echo \"root:#{system_password}\" | chpasswd")
+    system("echo \"concerto:#{system_password}\" | chpasswd")
+    Bandshell::ConfigStore.delete_config('system_password')
+    Bandshell::ConfigStore.write_config('system_passwords_changed', 'true')
+  end
+end
 
 dir_mode = (ConcertoConfigServer.development? ? :normal : :system)
 
@@ -18,6 +31,6 @@ timer_argv = ARGV.dup
 timer_argv << "--" unless timer_argv.include? "--"
 timer_argv << bandshell_url
 
-Daemons.run(File.join(File.dirname(__FILE__), "bandshell-timer.rb"), 
+Daemons.run(File.join(File.dirname(__FILE__), "bandshell-timer.rb"),
             :log_output=>true, :dir_mode => dir_mode,
             :ARGV => timer_argv)

data/lib/bandshell/application/app.rb

@@ -20,7 +20,7 @@ class ConcertoConfigServer < Sinatra::Base
 
   # listen on all IPv4 and IPv6 interfaces
   set :bind, '::'
-  
+
   # Provide an option to skip network settings when developing
   set :no_netconfig, false
 
@@ -33,11 +33,15 @@ class ConcertoConfigServer < Sinatra::Base
     rescue LoadError
       puts '  Reloading is not enabled, however.'
       puts '  You can enable limited app.rb reloading in development by'
-      puts '  installing the sinatra-contrib gem on your system.'   
-    end 
+      puts '  installing the sinatra-contrib gem on your system.'
+    end
     set :no_netconfig, true
   end
 
+  def active_page?(path='')
+    request.path_info == '/' + path
+  end
+
   def player_info
     # Note: probably not thread-safe.
     @@player_info ||= Bandshell::PlayerInfo.new
@@ -45,19 +49,19 @@ class ConcertoConfigServer < Sinatra::Base
 
   # push these over to netconfig.rb?
   # Our list of available physical-layer connection methods...
-  CONNECTION_METHODS = [ 
-    Bandshell::WiredConnection, 
-    Bandshell::WirelessConnection 
+  CONNECTION_METHODS = [
+    Bandshell::WiredConnection,
+    Bandshell::WirelessConnection
   ]
   # ... and available layer-3 addressing methods.
-  ADDRESSING_METHODS = [ 
-    Bandshell::DHCPAddressing, 
-    Bandshell::StaticAddressing 
+  ADDRESSING_METHODS = [
+    Bandshell::DHCPAddressing,
+    Bandshell::StaticAddressing
   ]
 
   # Hosts we allow to access configuration without authenticating.
-  LOCALHOSTS = [ 
-    IPAddress.parse("127.0.0.1"),    # ipv4 
+  LOCALHOSTS = [
+    IPAddress.parse("127.0.0.1"),    # ipv4
     IPAddress.parse("::ffff:127.0.0.1"),  # ipv6-mapped ipv4
     IPAddress.parse("::1")      # ipv6
   ]
@@ -78,7 +82,7 @@ class ConcertoConfigServer < Sinatra::Base
     end
 
     # Enforce authentication on actions.
-    # Calling from within an action will check authentication and return 
+    # Calling from within an action will check authentication and return
     # 401 if unauthorized.
     def protected!
       unless authorized?
@@ -96,13 +100,13 @@ class ConcertoConfigServer < Sinatra::Base
     # Check authorization credentials.
     # Currently configured to check if the REMOTE_ADDR is local and allow
     # everything if so. This permits someone at local console to configure
-    # without the need for a password. Others must have the correct 
+    # without the need for a password. Others must have the correct
     # password to be considered authorized.
     def authorized?
       password = Bandshell::ConfigStore.read_config(
         'password', 'default'
       )
-      if request_is_local? 
+      if request_is_local?
         # allow all requests from localhost no questions asked
         true
       else
@@ -128,7 +132,7 @@ class ConcertoConfigServer < Sinatra::Base
       end
     end
 
-    # Try to figure out what our current port is 
+    # Try to figure out what our current port is
     # and return it as a string.
     def my_port
       settings.port
@@ -153,7 +157,7 @@ class ConcertoConfigServer < Sinatra::Base
     # Check if we can retrieve a URL and get a 200 status code.
     def validate_url(url)
       begin
-        # this will fail with Errno::something if server 
+        # this will fail with Errno::something if server
         # can't be reached
         uri = URI(url)
         Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
@@ -164,7 +168,7 @@ class ConcertoConfigServer < Sinatra::Base
           if response.code != "200"
             fail
           end
-        end        
+        end
 
         # if we get here we have a somewhat valid URL to go to
         true
@@ -176,7 +180,9 @@ class ConcertoConfigServer < Sinatra::Base
   end
 
   get '/' do
-    if concerto_url == ''
+    if !Bandshell::ConfigStore.config_exists?('system_passwords_changed')
+      redirect '/system_password'
+    elsif concerto_url == ''
       redirect '/setup'
     else
       redirect '/player_status'
@@ -206,13 +212,13 @@ class ConcertoConfigServer < Sinatra::Base
   get '/setup' do
     protected!
     if network_ok
-      # Everything's up and running, we just don't know what 
+      # Everything's up and running, we just don't know what
       # our URL should be.
       @url=Bandshell::ConfigStore.read_config('concerto_url')
       erb :setup
     else
       # The network settings are not sane, we don't have an IP.
-      # Redirect the user to the network configuration page to 
+      # Redirect the user to the network configuration page to
       # take care of this.
       redirect '/netconfig'
     end
@@ -252,7 +258,7 @@ class ConcertoConfigServer < Sinatra::Base
   # TODO: clean this up.
   get '/authenticate.json' do
     result = {:accepted => 0}
-    stat= Bandshell::HardwareApi.attempt_to_get_screen_data! 
+    stat= Bandshell::HardwareApi.attempt_to_get_screen_data!
     if stat == :stat_success
       result[:accepted] = 1
       result[:url] = Bandshell::HardwareApi.screen_url
@@ -287,11 +293,11 @@ class ConcertoConfigServer < Sinatra::Base
       am = nil
     end
 
-    # view will grab what it can from our existing 
+    # view will grab what it can from our existing
     # connection/addressing methods using value_from().
-    erb :netsettings, :locals => { 
-        :connection_method => cm, 
-        :addressing_method => am 
+    erb :netsettings, :locals => {
+        :connection_method => cm,
+        :addressing_method => am
       }
   end
 
@@ -303,7 +309,7 @@ class ConcertoConfigServer < Sinatra::Base
 
   # Extract arguments from a set of form data that are intended to go to a
   # specific network configuration class. These fields have names of the form
-  # 'ClassName/field_name'; this function returns a hash in the form 
+  # 'ClassName/field_name'; this function returns a hash in the form
   # { 'field_name' => 'value } containing the configuration arguments.
   def extract_class_args(params, target_class)
     result = { }
@@ -318,7 +324,7 @@ class ConcertoConfigServer < Sinatra::Base
   end
 
   # Set the arguments on an instance of a given configuration class.
-  # This uses the safe_assign method that should be present in all 
+  # This uses the safe_assign method that should be present in all
   # configuration classes to determine which values are allowed to be passed
   # via form fields (i.e. which ones are subject to validation)
   def do_assign(params, instance)
@@ -338,14 +344,14 @@ class ConcertoConfigServer < Sinatra::Base
     # First we find the connection-method and addressing-method classes.
     cmclass = pick_class(params[:connection_type], CONNECTION_METHODS)
     fail "Connection method not supported" if cmclass.nil?
-    
+
     amclass = pick_class(params[:addressing_type], ADDRESSING_METHODS)
     fail "Addressing method not supported" if amclass.nil?
 
     # ... and create some instances of them.
     cm = cmclass.new
     am = amclass.new
-    
+
     # Now given the names of the specific classes the user has chosen,
     # extract the corresponding form fields.
     cmargs = extract_class_args(params, cmclass.basename)
@@ -372,30 +378,47 @@ class ConcertoConfigServer < Sinatra::Base
     redirect '/netconfig' # as a get request
   end
 
-  get '/password' do
+  get '/config_password' do
     protected!
-    erb :password
+    erb :config_password
   end
 
-  post '/password' do
+  post '/config_password' do
     protected!
-    
+
     if params[:newpass] != params[:newpass_confirm]
-      # something something error handling something
-      redirect '/password'
+      #write flash notice
+      redirect '/config_password'
     end
-    
     Bandshell::ConfigStore.write_config('password', params[:newpass])
     redirect '/setup'
   end
-  
+
+  get '/system_password' do
+    protected!
+    if Bandshell::ConfigStore.config_exists?('system_passwords_changed')
+      redirect '/setup'
+    end
+    erb :system_password
+  end
+
+  post '/system_password' do
+    protected!
+    if params[:system_password] != params[:system_password_confirm]
+      #write flash notice
+      redirect '/system_password'
+    end
+    Bandshell::ConfigStore.write_config('system_password', params[:system_password])
+    redirect '/setup'
+  end
+
   #Shows uptime,firmware version, and general system and process information
   #Requires ffi, sys-uptime, and sys-proctable gems
   get '/player_status' do
     @proctable = ProcTable.ps
     @on_off_rules = player_info.on_off_rules
     erb :player_status
-  end  
+  end
 
   # Should be fetched at a regular interval by the background job
   # to execute system maintenance functions such as updating configs

data/lib/bandshell/application/views/{password.erb → config_password.erb}

@@ -1,10 +1,4 @@
-<div class="clearfix">
-  <ul class="nav nav-tabs">
-    <li><a href="/setup">Basic Setup</a></li>
-    <li><a href="/netconfig">Network Settings</a></li>
-    <li class="active"><a href="/password">Configuration Password</a></li>
-  </ul>
-</div>
+<%= erb(:navbar, :layout => false) %>
 
 <div class="default-padding">
   <form method="post">
@@ -20,4 +14,4 @@
       <input type="submit" class="btn btn-primary" value="Change Password"></input>
     </p>
   </form>
-</div>
+</div>

data/lib/bandshell/application/views/main.erb

@@ -9,9 +9,6 @@
   <script src="javascripts/jquery-1.7.2.js"></script>
 </head>
 <body>
-  <%#= render :partial => "elements/topmenu_contents" %>
-  <%#= render :partial => "elements/render_flash" %>
-
   <div id="main" class="container-fluid">
 
     <section class="viewblock">

data/lib/bandshell/application/views/navbar.erb

@@ -0,0 +1,20 @@
+<div class="clearfix">
+  <ul class="nav nav-tabs">
+    <li class=<%= "active" if active_page?("setup") %>>
+      <a href="/setup">Basic Setup</a>
+    </li>
+
+    <li class=<%= "active" if active_page?("netconfig") %>>
+      <a href="/netconfig">Network Settings</a>
+    </li>
+
+    <li class=<%= "active" if active_page?("config_password") %>>
+      <a href="/config_password">Configuration Password</a>
+    </li>
+    <% unless Bandshell::ConfigStore.config_exists?('system_passwords_changed') %>
+      <li class=<%= "active" if active_page?("system_password") %>>
+        <a href="/system_password">System Passwords</a>
+      </li>
+    <% end %>
+  </ul>
+</div>

data/lib/bandshell/application/views/netsettings.erb

@@ -1,19 +1,13 @@
 <script src="/javascripts/network.js"></script>
 
-<div class="clearfix">
-  <ul class="nav nav-tabs">
-    <li><a href="/setup">Basic Setup</a></li>
-    <li class="active"><a href="/netconfig">Network Settings</a></li>
-    <li><a href="/password">Configuration Password</a></li>
-  </ul>
-</div>
+<%= erb(:navbar, :layout => false) %>
 
 <div>
 
   <form method="post">
     <fieldset>
       <legend><span>Connection Type</span></legend>
-      
+
       <div class="clearfix">
         <select id="connection_type" name="connection_type">
           <!--  list out our available connection methods as options set the html selected flag on the one that is currently selected in the config -->
@@ -21,13 +15,13 @@
             <option <%= cm==connection_method.class ? 'selected' : '' %> value="<%= cm.basename %>">
               <%= cm.description %>
             </option>
-          <% end %> 
+          <% end %>
         </select>
       </div>
 
       <div id="connection">
         <div id="WiredConnection" class="clearfix">
-          
+
           <div class="clearfix">
             <label for="WiredConnection_interface_name">Interface Name</label>
             <div class="input">
@@ -66,7 +60,7 @@
 
             </div>
             <div class="span6">
-              
+
               <div class="clearfix">
                 <label for="WirelessConnection_ssid">SSID</label>
                 <div class="input">
@@ -99,7 +93,7 @@
         <div id="StaticAddressing" class="clearfix">
           <div class="row-fluid">
             <div class="span6">
-              
+
               <div class="clearfix">
                 <label for="StaticAddressing_address">Address</label>
                 <div class="input">
@@ -116,7 +110,7 @@
 
             </div><!-- end .span6 -->
             <div class="span6">
-              
+
               <div class="clearfix">
                 <label for="StaticAddressing_gateway">Gateway</label>
                 <div class="input">
@@ -144,4 +138,4 @@
     </div>
 
   </form>
-</div>
+</div>

data/lib/bandshell/application/views/setup.erb

@@ -6,13 +6,7 @@
   <% end %>
 <% end %>
 
-<div class="clearfix">
-  <ul class="nav nav-tabs">
-    <li class="active"><a href="/setup">Basic Setup</a></li>
-    <li><a href="/netconfig">Network Settings</a></li>
-    <li><a href="/password">Configuration Password</a></li>
-  </ul>
-</div>
+<%= erb(:navbar, :layout => false) %>
 
 <div class="default-padding">
   <% if @url.empty? %>
@@ -61,4 +55,4 @@
       </tbody>
     </table>
   </div>
-</div>
+</div>

data/lib/bandshell/application/views/system_password.erb

@@ -0,0 +1,19 @@
+<%= erb(:navbar, :layout => false) %>
+
+<h3>Please change the SSH password for this player here. Once the password is set, further changes can be made via the command line.</h3>
+
+<div class="default-padding">
+  <form method="post">
+    <p>
+      <label for="system_password">System SSH Password</label>
+      <input class="input-large" name="system_password" type="password"></input>
+    </p>
+    <p>
+      <label for="system_password_confirm">Confirm Password</label>
+      <input class="input-large" name="system_password_confirm" type="password"></input>
+    </p>
+    <p>
+      <input type="submit" class="btn btn-primary" value="Change Passwords"></input>
+    </p>
+  </form>
+</div>

data/lib/bandshell/config_store.rb

@@ -8,7 +8,7 @@ module Bandshell
     @@path = nil
 
     def self.read_config(name, default='')
-      initialize_path if not @@path      
+      initialize_path if not @@path
       file = File.join(@@path, name)
       rofile = File.join(@@ropath, name)
 
@@ -24,14 +24,14 @@ module Bandshell
         default
       end
     end
-    
+
     #check if a config exists
     def self.config_exists?(name)
       initialize_path if not @@path
       file = File.join(@@path, name)
       rofile = File.join(@@ropath, name)
       File.exist?(file) || File.exist?(rofile)
-    end    
+    end
 
     # Write a config to the read/write configuration location.
     def self.write_config(name, value)
@@ -43,6 +43,13 @@ module Bandshell
       end
     end
 
+    # Delete a config from the filesystem
+    def self.delete_config(name)
+      initialize_path if not @@path
+      file = File.join(@@path, name)
+      FileUtils.rm(file)
+    end
+
     def self.initialize_path
       @@ropath = File.join(LiveImage.mountpoint, 'concerto', 'config')
       if LiveImage.readonly?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bandshell
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -138,12 +138,14 @@ files:
 - lib/bandshell/application/public/stylesheets/sass/views/users.scss
 - lib/bandshell/application/public/trollface.png
 - lib/bandshell/application/views/authenticate.erb
+- lib/bandshell/application/views/config_password.erb
 - lib/bandshell/application/views/main.erb
+- lib/bandshell/application/views/navbar.erb
 - lib/bandshell/application/views/netsettings.erb
-- lib/bandshell/application/views/password.erb
 - lib/bandshell/application/views/player_status.erb
 - lib/bandshell/application/views/problem.erb
 - lib/bandshell/application/views/setup.erb
+- lib/bandshell/application/views/system_password.erb
 - lib/bandshell/config_store.rb
 - lib/bandshell/hardware_api.rb
 - lib/bandshell/live_image.rb