bandshell 1.3 → 1.6

data/bin/{concerto_netsetup → bandshelld_boot}

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bandshell/netconfig'
+require 'bandshell/passwords'
 
 Bandshell::configure_system_network
+Bandshell::Passwords.set_local_passwords

data/lib/bandshell/application/app.rb

@@ -27,6 +27,7 @@ class ConcertoConfigServer < Sinatra::Base
   configure :development do
     puts 'Bandshell Config Server starting in development mode, port '+
       settings.port.to_s
+    enable :logging, :dump_errors, :raise_errors
     begin
       require "sinatra/reloader"
       register Sinatra::Reloader
@@ -36,6 +37,7 @@ class ConcertoConfigServer < Sinatra::Base
       puts '  installing the sinatra-contrib gem on your system.'
     end
     set :no_netconfig, true
+    set :show_exceptions, true
   end
 
   def active_page?(path='')
@@ -386,9 +388,10 @@ class ConcertoConfigServer < Sinatra::Base
   post '/config_password' do
     protected!
 
+    @errors = []
     if params[:newpass] != params[:newpass_confirm]
-      #write flash notice
-      redirect '/config_password'
+      @errors << 'Please make sure the passwords entered are the same.'
+      erb :config_password
     end
     Bandshell::ConfigStore.write_config('password', params[:newpass])
     redirect '/setup'
@@ -397,19 +400,27 @@ class ConcertoConfigServer < Sinatra::Base
   get '/system_password' do
     protected!
     if Bandshell::ConfigStore.config_exists?('system_passwords_changed')
-      redirect '/setup'
+      @errors = []
+      @errors << 'The system password has already been set. Please log in via SSH and use the passwd command to change it again.'
+      #redirect '/setup' TODO: something better.
+    else
+      erb :system_password
     end
-    erb :system_password
   end
 
   post '/system_password' do
     protected!
-    if params[:system_password] != params[:system_password_confirm]
-      #write flash notice
-      redirect '/system_password'
+    @errors = []
+    if Bandshell::ConfigStore.config_exists?('system_passwords_changed')
+      @errors << 'The system password has already been set. Please log in via SSH and use the passwd command to change it again.'
+      erb :system_password
+    elsif params[:system_password] != params[:system_password_confirm]
+      @errors << 'Please make sure the passwords entered are the same.'
+      erb :system_password
+    else
+      Bandshell::ConfigStore.write_config('system_password', params[:system_password])
+      redirect '/setup'
     end
-    Bandshell::ConfigStore.write_config('system_password', params[:system_password])
-    redirect '/setup'
   end
 
   #Shows uptime,firmware version, and general system and process information

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

@@ -1,3 +1,11 @@
+<% unless @errors.nil? %>
+  <% @errors.each do |error| %>
+    <p style="color:red">
+      <%= error %>
+    </p>
+  <% end %>
+<% end %>
+
 <div class="clearfix">
   <ul class="nav nav-tabs">
     <li class=<%= "active" if active_page?("setup") %>>
@@ -16,5 +24,8 @@
         <a href="/system_password">System Passwords</a>
       </li>
     <% end %>
+    <li class=<%= "active" if active_page?("player_status") %>>
+      <a href="/player_status">Player Status</a>
+    </li>
   </ul>
 </div>

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

@@ -1,6 +1,27 @@
+<%= erb(:navbar, :layout => false) %>
+
+<script type="text/javascript">
+  togglespeed=0;
+  function toggleProcs() {
+    if ($("#proclist").is(":visible")) {
+      $("#proclist").hide(togglespeed);
+      $("#procexpand").text("expand");
+    } else {
+      $("#proclist").show(togglespeed);
+      $("#procexpand").text("hide");
+    }
+    togglespeed=700; //after the first time
+  }
+  $().ready(toggleProcs); //start hidden
+</script>
+
+<h1>System Information</h1>
 <p>System Uptime: <%= Uptime.uptime %></p>
-<p>System Processes:</p>
-<ul>
+<p>
+  System Processes: <%= @proctable.count %>
+  (<a id="procexpand" href="#" onclick="toggleProcs(700)">expand</a>)
+</p>
+<ul id="proclist">
   <% for p in @proctable %>
     <li>
       <b>
@@ -10,10 +31,22 @@
     </li>
   <% end %>
 </ul>
+
+<h1>Player Configuration</h1>
+<p>
+Screen Name:
+  <%= player_info.screen_name %>
+</p>
+
+<h1>Display Status</h1>
 <p>Screen on/off rules:</p>
 <pre>
   <%= JSON.pretty_generate(@on_off_rules) %>
 </pre>
+<p>
+  Time Zone:
+  <%= player_info.timezone.nil? ? "Not set" : player_info.timezone %>
+</p>
 <p>
   Screen scheduled state: 
   <%= player_info.screen_scheduled_on? ? "On" : "Off" %>

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

@@ -1,11 +1,3 @@
-<% unless @errors.nil? %>
-  <% @errors.each do |error| %>
-    <p style="color:red">
-      <%= error %>
-    </p>
-  <% end %>
-<% end %>
-
 <%= erb(:navbar, :layout => false) %>
 
 <div class="default-padding">

data/lib/bandshell/passwords.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require 'bandshell/config_store'
+
+module Bandshell
+  module Passwords
+    def self.set_local_passwords
+      if Bandshell::ConfigStore.config_exists?('system_passwords_changed')
+        # if we have changed the passwords, try to restore the shadow file
+        # from the configuration store
+        restore_shadow
+      else
+        #if the password has not been changed before during initial setup,
+        #read a new one and change passwords accordingly
+        system_password = Bandshell::ConfigStore.read_config('system_password', '')
+        unless system_password.empty?
+          IO.popen("chpasswd", mode='r+') do |io|
+            io.puts "root:#{system_password}"
+            io.puts "concerto:#{system_password}"
+          end
+
+          if $? == 0 
+            # remove plain text passwords from config and set flag
+            Bandshell::ConfigStore.delete_config('system_password')
+            Bandshell::ConfigStore.write_config('system_passwords_changed', 'true')
+
+            # save shadow file (with password hashes) into config
+            save_shadow
+          else
+            # chpasswd returned nonzero status... do something to indicate error
+          end
+        end
+      end
+    end
+    
+    def self.save_shadow
+      shadow_content = IO.read("/etc/shadow")
+      Bandshell::ConfigStore.write_config('shadow_file', shadow_content)
+    end
+
+    def self.restore_shadow
+      oldshadow = IO.read("/etc/shadow")
+      shadow_content = Bandshell::ConfigStore.read_config('shadow_file', oldshadow)
+      IO.write("/etc/shadow", shadow_content)
+    end
+  end
+end

data/lib/bandshell/player_info.rb

@@ -1,6 +1,7 @@
 require 'bandshell/config_store'
 require 'net/http'
 require 'json'
+require 'tzinfo'
 
 # This class can be thought of as a singleton model which retrieves,
 # manipulates, and stores information about the Player received from
@@ -11,6 +12,8 @@ module Bandshell
     attr_accessor :last_update
     attr_accessor :on_off_rules
     attr_accessor :shelf_life
+    attr_accessor :screen_name
+    attr_accessor :timezone   # String representation of TZ Location
 
     def initialize
       @last_update  = Time.new(0)
@@ -40,6 +43,18 @@ module Bandshell
       elsif data == :stat_badauth
         puts "update_player_info: Auth error while retrieving player info."
       else
+        unless data['screen'].nil? or data['screen']['name'].nil?
+          @screen_name = data['screen']['name']
+        end
+        tz_string = data['time_zone']
+        unless tz_string.nil? or tz_string.empty?
+          begin
+            new_tz = TZInfo::Timezone.get(tz_string)
+            @timezone = tz_string
+          rescue TZInfo::InvalidTimezoneIdentifier => e
+            puts "update_player_info: Invalid timezone received."
+          end
+        end # TZ identifier present
         new_rules = data['screen_on_off']
         if new_rules.nil? or !new_rules.is_a? Array
           puts "update_player_info: Invalid screen on/off rules received."
@@ -55,12 +70,18 @@ module Bandshell
     # Returns true if the screen should be turned on right now,
     # according to the latest data recieved from concerto-hardware.
     # Assumes on_off_rules is either nil or a valid ruleset.
-    # TODO: Evaluate effects of timezones
     def screen_scheduled_on?
       return true if on_off_rules.nil?
-
       results = []
-      t = Time.now
+
+      begin
+        tz = TZInfo::Timezone.get(timezone) unless timezone.nil?
+      rescue TZInfo::InvalidTimezoneIdentifier => e
+        puts('screen_scheduled_on?: Invalid Time Zone. Defaulting to NY.')
+      end
+      tz = TZInfo::Timezone.get('America/New_York') if tz.nil?
+
+      t = tz.now
       on_off_rules.each do |rule|
         rule_active = true
         rule.each do |key, value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bandshell
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.6'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -80,19 +80,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client-side tools for Concerto digital signage
 email: team@concerto-signage.org
 executables:
-- concerto_netsetup
+- bandshelld_boot
 - bandshelld
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/bandshell-timer.rb
+- bin/bandshell-timer.rb.output
 - bin/bandshelld
-- bin/concerto_netsetup
+- bin/bandshelld.output
+- bin/bandshelld_boot
 - lib/bandshell/application/app.rb
 - lib/bandshell/application/config.ru
+- lib/bandshell/application/log/development.log
 - lib/bandshell/application/public/favicon.ico
 - lib/bandshell/application/public/images/elements/logomark.png
 - lib/bandshell/application/public/images/layout/pagebg.gif
@@ -150,6 +167,7 @@ files:
 - lib/bandshell/hardware_api.rb
 - lib/bandshell/live_image.rb
 - lib/bandshell/netconfig.rb
+- lib/bandshell/passwords.rb
 - lib/bandshell/player_info.rb
 - lib/bandshell/screen_control.rb
 homepage: 
@@ -172,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Concerto Client Tools