bandshell 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beea7cdea7691d147af26efd6d0f67fe84063c87
-  data.tar.gz: 8773553c0b3c9fe6cbab5995c177a167df00d049
+  metadata.gz: 4f98087fc1c8d04747df09f03de6bbc00e57ba2e
+  data.tar.gz: b0832fa74e5106bf33e8c7144df3ec53204dda8a
 SHA512:
-  metadata.gz: 4190b397f27b8e568d75f44749f3b01069629f2f7f39ecb470cb22b3b9a848793615330ea276f8846a542b425cefee3f88c8ca7aae7bc4e1e7aaf7534d088b92
-  data.tar.gz: 3bda390fcf5df6debc588b81e6474e139c693306a95a57e81e1791ff1cc5c9930ee5ce1785191f905246e430457ea3d247625ed1b3fe3a00ed0f2bb30b79c21f
+  metadata.gz: 897c2197b7a44f22579a896da40f3ceeec9ff01a3730d3799992e1781365ff14a24dc6632ec20aed29211f93bb736a6c99295fa4ea8f429b9891549aba9b3ace
+  data.tar.gz: bf6c27fa4301422f1ba43cabc1b24604078eabb6e3b29c2b1085d1d25504bc9ea66668b073f434ce67308f689e77f4e58c65bca65fcb1cf261ff4067f5df588c

data/lib/bandshell/application/app.rb

@@ -155,12 +155,16 @@ class ConcertoConfigServer < Sinatra::Base
       begin
         # this will fail with Errno::something if server 
         # can't be reached
-        response = Net::HTTP.get_response(URI(url))
-        if response.code != "200"
+        uri = URI(url)
+        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+          request = Net::HTTP::Get.new uri.request_uri
+          response = http.request request
           # also bomb out if we don't get an OK response
           # maybe demanding 200 is too strict here?
-          fail
-        end
+          if response.code != "200"
+            fail
+          end
+        end        
 
         # if we get here we have a somewhat valid URL to go to
         true

data/lib/bandshell/hardware_api.rb

@@ -74,6 +74,16 @@ module Bandshell
       @screen_url = nil
       @screen_id =nil
     end
+    
+    def get_https_response(uri, options={})
+      Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+        request = Net::HTTP::Get.new uri.request_uri
+        unless options[:user].nil?  && options[:pass].nil?
+          request.basic_auth options[:user], options[:pass]
+        end
+        response = http.request request
+      end
+    end    
       
     # Get array of data about the screen from the server
     # This can only succeed once we have obtained a valid auth token.
@@ -112,47 +122,42 @@ module Bandshell
       end
     end
 
-
     def get_with_auth(uri, user, pass)
-      begin
-        req = Net::HTTP::Get.new(uri.to_s)
-        req.basic_auth user, pass
-        res = Net::HTTP.start(uri.hostname, uri.port) { |http|
-          http.request(req)
-        }
+      begin       
+        response = get_https_response(uri, {:user => user, :pass => pass})         
       rescue StandardError => ex
         puts "get_with_auth: Failed to access concerto server:\n"+
              "   "+ex.message.chomp
-        res = nil
+        response = nil
       end
-      res
+      response
     end
 
     def request_temp_token!
       begin
-        response = Net::HTTP.get_response(frontend_api_uri)
+        response = get_https_response(frontend_api_uri)
+        
+        if response.code != "200"
+          puts "request_temp_token: Unsuccessful request, HTTP "+response.code+"."
+          return false
+        end
+
+        data=JSON.parse(response.body)
+        if data.has_key? 'screen_temp_token'
+          # We modify the token by appending an "s".
+          # Concerto allows this and concerto-hardware will use it to
+          # recognize that the user is setting up a managed player in
+          # addition to a simple screen.
+          token = data['screen_temp_token'] + 's'
+          ConfigStore.write_config('auth_temp_token',token)
+          return true
+        end
+        return false   
       rescue StandardError => ex
         puts "request_temp_token: Failed to access concerto server:\n"+
              "   "+ex.message.chomp
         return false
       end
-
-      if response.code != "200"
-        puts "request_temp_token: Unsuccessful request, HTTP "+response.code+"."
-        return false
-      end
-
-      data=JSON.parse(response.body)
-      if data.has_key? 'screen_temp_token'
-        # We modify the token by appending an "s".
-        # Concerto allows this and concerto-hardware will use it to
-        # recognize that the user is setting up a managed player in
-        # addition to a simple screen.
-        token = data['screen_temp_token'] + 's'
-        ConfigStore.write_config('auth_temp_token',token)
-        return true
-      end
-      return false
     end
 
     # If the temp token has been accepted, convert it into an auth token,
@@ -165,31 +170,31 @@ module Bandshell
       return :stat_err if temp_token.empty? #should not happen
 
       query = URI.join(frontend_api_uri,"?screen_temp_token="+temp_token)
+      begin   
+        response = get_https_response(query)
+
+        if response.code != "200"
+          puts "check_temp_token: Unsuccessful request, HTTP "+response.code+"."
+          return :stat_serverr
+        end
+        
+        data=JSON.parse(response.body)
+        if data.has_key? 'screen_auth_token'
+          ConfigStore.write_config('auth_token',data['screen_auth_token'])
+          ConfigStore.write_config('auth_temp_token','')
+          return :stat_success
+        elsif data.has_key? 'screen_temp_token'
+          # Indicates the API was accessed successfuly but the temp token
+          # has not been entered yet.
+          return :stat_success
+        end
+        return :stat_err
 
-      begin
-        response = Net::HTTP.get_response(query)
       rescue StandardError => ex
         puts "check_temp_token: Failed to access concerto server:\n"+
              "   "+ex.message.chomp
         return :stat_serverr
-      end
-
-      if response.code != "200"
-        puts "check_temp_token: Unsuccessful request, HTTP "+response.code+"."
-        return :stat_serverr
-      end
-
-      data=JSON.parse(response.body)
-      if data.has_key? 'screen_auth_token'
-        ConfigStore.write_config('auth_token',data['screen_auth_token'])
-        ConfigStore.write_config('auth_temp_token','')
-        return :stat_success
-      elsif data.has_key? 'screen_temp_token'
-        # Indicates the API was accessed successfuly but the temp token
-        # has not been entered yet.
-        return :stat_success
-      end
-      return :stat_err
+      end     
     end
 
     public

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: bandshell
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   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'
 - !ruby/object:Gem::Dependency
   name: sys-uptime
   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'
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   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'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   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'
 - !ruby/object:Gem::Dependency
   name: daemons
   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
@@ -88,6 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/bandshell-timer.rb
+- bin/bandshelld
+- bin/concerto_netsetup
 - lib/bandshell/application/app.rb
 - lib/bandshell/application/config.ru
 - lib/bandshell/application/public/favicon.ico
@@ -147,9 +150,6 @@ files:
 - lib/bandshell/netconfig.rb
 - lib/bandshell/player_info.rb
 - lib/bandshell/screen_control.rb
-- bin/bandshell-timer.rb
-- bin/bandshelld
-- bin/concerto_netsetup
 homepage: 
 licenses: []
 metadata: {}
@@ -159,17 +159,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Concerto Client Tools