sras 2.1.4 → 2.1.5

data/CHANGELOG

@@ -1,3 +1,15 @@
+2.1.5
+    - escape asset name and description.  previously assets with
+      certain values in the name and/or description fields would
+      trigger exceptions in OpenSim.
+    - when starting sras in background print a message instead of
+      being silent
+    - abort if certain files aren't writable
+
+2.1.4
+    - fix for DataMapper 1.2.0 compatibility.  fixes exceptions on
+      POST.
+
 2.1.3
     - add --foreground, --socket, and --environment options
     - daemonize by default

data/Gemfile

@@ -1,11 +1,2 @@
 source "http://rubygems.org"
-#gem 'dm-migrations'
-#gem 'dm-mysql-adapter'
-#gem 'dm-timestamps'
-#gem 'dm-types'
-#gem 'hpricot'
-#gem 'sinatra'
-#gem 'thin'
-#gem 'rake'
-
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sras (2.1.2)
+    sras (2.1.4)
       dm-migrations (= 1.2.0)
       dm-mysql-adapter (= 1.2.0)
       dm-timestamps (= 1.2.0)
@@ -14,10 +14,10 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.2.7)
     bcrypt-ruby (3.0.1)
-    daemons (1.1.4)
-    data_objects (0.10.6)
+    daemons (1.1.8)
+    data_objects (0.10.8)
       addressable (~> 2.1)
     dm-core (1.2.0)
       addressable (~> 2.2.6)
@@ -39,14 +39,14 @@ GEM
       multi_json (~> 1.0.3)
       stringex (~> 1.3.0)
       uuidtools (~> 2.1.2)
-    do_mysql (0.10.6)
-      data_objects (= 0.10.6)
+    do_mysql (0.10.8)
+      data_objects (= 0.10.8)
     eventmachine (0.12.10)
     fastercsv (1.5.4)
     hpricot (0.8.4)
     json (1.6.5)
     multi_json (1.0.4)
-    rack (1.3.3)
+    rack (1.4.1)
     rake (0.9.2.2)
     sinatra (1.2.6)
       rack (~> 1.1)

data/README.rst

@@ -70,7 +70,7 @@ table, and have a file contain the asset data on disk.
 
 To test retrieval of that asset: ::
 
-   $ curl -X GET \
+   $ curl -X GET -w '%{http_code}\n' \
         http://yourserver.example.com:8003/assets/0193663d-44e4-4e6e-9a1c-8dd2febc5fc5/data 
 
 

data/bin/sras

@@ -11,10 +11,6 @@ require "#{ROOT}/../lib/sras/helpers/init.rb"
 
 options = {}
 
-# defaults...
-options[:environment] = ENV['RACK_ENV'] || 'production'
-options[:config_file] = config_file
-
 OptionParser.new do |opts|
     opts.banner = 'Usage: sras [options] start'
 
@@ -69,15 +65,9 @@ OptionParser.new do |opts|
     end 
 end.parse!
 
-RACK_ENV = options[:environment]
+RACK_ENV = options[:environment] || ENV['RACK_ENV'] || 'production'
 
-# load SRAS config file...
-if File.exists?(options[:config_file])
-    @config = YAML.load_file(options[:config_file])
-else
-    warn "Couldn't find SRAS config file.  Exiting."
-    exit 1
-end
+@config = load_config_file(options[:config_file])
 
 if ! options[:host]
     if @config['sras'][RACK_ENV]['host']
@@ -113,6 +103,13 @@ end
 
 require "#{ROOT}/../lib/sras.rb"
 
+# abort if default asset dir, log file, or pid file aren't writable...
+[ $default_asset_dir, options[:log_file], options[:pid_file] ].each do |file|
+    if File.exists?(file) && ! File.writable?(file)
+        abort "Oops.  File #{file} isn't writable.  Exiting."
+    end      
+end
+
 if options[:command] == 'start'
     if options[:socket]
         server = Thin::Server.new(options[:socket], SRAS.new)
@@ -123,6 +120,7 @@ if options[:command] == 'start'
     server.pid_file = options[:pid_file]
     server.tag = 'sras'
     unless options[:foreground]
+        warn "Starting sras on #{options[:host]} port TCP #{options[:port]}"
         server.daemonize
     end
     server.start

data/lib/sras/helpers/asset.rb

@@ -3,6 +3,8 @@ require 'sinatra/base'
 module Sinatra
     module AssetHelper
 
+        include Rack::Utils
+
         def get_asset_data(asset_id)
             @asset = Asset.get(asset_id)
 

data/lib/sras/helpers/config.rb

@@ -1,9 +1,24 @@
-def config_file()
-    if File.exists?("#{ROOT}/config/config.yml")
-        return "#{ROOT}/config/config.yml"
-    elsif File.exists?(File.expand_path('~/.srasrc'))
-        return File.expand_path('~/.srasrc')
-    else
-        return '/etc/sras/sras.conf'
+#
+# load config file
+#
+
+def load_config_file(config_file=nil)
+    if config_file.nil?
+        if File.exists?("#{ROOT}/config/config.yml")
+            config_file = "#{ROOT}/config/config.yml"
+        elsif File.exists?(File.expand_path('~/.srasrc'))
+            config_file = File.expand_path('~/.srasrc')
+        elsif File.exists('/etc/sras/sras.conf')
+            config_file = '/etc/sras/sras.conf'
+        else
+            warn "Couldn't find SRAS config file.  Exiting."
+            exit 1
+        end
+    end
+
+    begin
+        return YAML.load_file(config_file) 
+    rescue
+        abort "Oops.  Couldn't open config file #{config_file} ...  Aborting."
     end
 end

data/lib/sras/models/init.rb

@@ -1,11 +1,8 @@
-require 'sinatra'
 require 'dm-core'
 require 'dm-types'
 require 'dm-timestamps'
 
-set :environment, RACK_ENV.to_sym
-
-configure :development do
+if RACK_ENV == 'development'
     DataMapper::Logger.new(STDOUT, :debug)
 end
 

data/lib/sras/views/metadata.erb

@@ -4,8 +4,8 @@
     <Guid><%= @asset.id %></Guid> 
   </FullID> 
   <ID><%= @asset.id %></ID> 
-  <Name><%= @asset.name %></Name> 
-  <Description><%= @asset.description %></Description> 
+  <Name><%= escape_html @asset.name %></Name> 
+  <Description><%= escape_html @asset.description %></Description> 
   <CreationDate><%= @asset.created_at.to_time.iso8601 %></CreationDate> 
   <Type><%= @asset.asset_type %></Type> 
   <Local><%= @asset.local %></Local> 

data/lib/sras/views/show.erb

@@ -5,8 +5,8 @@
     <Guid><%= @asset.id %></Guid> 
   </FullID> 
   <ID><%= @asset.id %></ID> 
-  <Name><%= @asset.name %></Name> 
-  <Description><%= @asset.description %></Description> 
+  <Name><%= escape_html @asset.name %></Name> 
+  <Description><%= escape_html @asset.description %></Description> 
   <Type><%= @asset.asset_type %></Type> 
   <Local><%= @asset.local %></Local> 
   <Temporary><%= @asset.temporary %></Temporary> 

data/lib/sras.rb

@@ -7,6 +7,7 @@ require 'digest/sha2'
 require 'hpricot'
 
 class SRAS < Sinatra::Application
+    set :environment, RACK_ENV.to_sym
     set :views, Proc.new { File.join(root, "sras/views") }
 
     get '/' do

data/sras.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name          = 'sras'
-    s.version       = '2.1.4'
+    s.version       = '2.1.5'
     s.summary       = 'Simple Ruby Asset Server'
     s.description   = 'Asset server for use with OpenSimulator'
     s.authors       = 'Dave Coyle'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sras
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-migrations
-  requirement: &82622250 !ruby/object:Gem::Requirement
+  requirement: &73863030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *82622250
+  version_requirements: *73863030
 - !ruby/object:Gem::Dependency
   name: dm-mysql-adapter
-  requirement: &82622020 !ruby/object:Gem::Requirement
+  requirement: &73862800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *82622020
+  version_requirements: *73862800
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
-  requirement: &82621790 !ruby/object:Gem::Requirement
+  requirement: &73862570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *82621790
+  version_requirements: *73862570
 - !ruby/object:Gem::Dependency
   name: dm-types
-  requirement: &82621560 !ruby/object:Gem::Requirement
+  requirement: &73900110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *82621560
+  version_requirements: *73900110
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &82621330 !ruby/object:Gem::Requirement
+  requirement: &73899880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *82621330
+  version_requirements: *73899880
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &82621100 !ruby/object:Gem::Requirement
+  requirement: &73899650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *82621100
+  version_requirements: *73899650
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &82620870 !ruby/object:Gem::Requirement
+  requirement: &73899420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *82620870
+  version_requirements: *73899420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &82620640 !ruby/object:Gem::Requirement
+  requirement: &73899190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *82620640
+  version_requirements: *73899190
 description: Asset server for use with OpenSimulator
 email: hello@coyled.com
 executables: