ass 0.0.20 → 0.0.21

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/ass.yml

@@ -3,7 +3,8 @@ mode: development
 log: off
 cron: cron
 timer: 0
-user: admin
+user: admim
 pass: pass
+flood: 1
 apps:
 - app1

data/lib/ass.rb

@@ -20,6 +20,7 @@ require 'will_paginate'
 require 'will_paginate/sequel'  # or data_mapper/sequel
 require 'uri' 
 require 'sinatra/reloader' if development?
+require 'sinatra/synchrony'
 
 ############################################################
 ## Initilization Setup
@@ -47,13 +48,17 @@ env = ENV['SINATRA_ENV'] || "development"
 config = YAML.load_file("#{Dir.pwd}/ass.yml")
 $timer = "#{config['timer']}".to_i
 $cron = config['cron'] || 'cron'
-$port = config['port'] || 4567
+$port = "#{config['port']}".to_i || 4567
 $mode = config['mode'] || env
 $VERSION = File.open("#{ROOTDIR}/VERSION", "rb").read
 $apps = config['apps'] || []
 $log = config['log'] || 'off'
 $user = config['user'] || 'admin'
 $pass = config['pass'] || 'pass'
+$flood = "#{config['flood']}".to_i || 1  # default 1 minute
+
+$client_ip = '127.0.0.1'
+$last_access = 0
 
 ############################################################
 ## Certificate Key Setup
@@ -112,9 +117,8 @@ end
 ## Sequel Database Setup
 ############################################################
 
-unless File.exist?("#{Dir.pwd}/ass-#{$model}.db") then
-  $DB = Sequel.connect("sqlite://#{Dir.pwd}/ass-#{$model}.db")
-
+unless File.exist?("#{Dir.pwd}/ass-#{$mode}.db") then
+  $DB = Sequel.connect("sqlite://#{Dir.pwd}/ass-#{$mode}.db")
   $DB.create_table :tokens do
     primary_key :id
     String :app, :unique => false, :null => false
@@ -122,34 +126,26 @@ unless File.exist?("#{Dir.pwd}/ass-#{$model}.db") then
     Time :created_at
     index [:app, :token]
   end
-
   $DB.create_table :pushes do
     primary_key :id
-    String :pid, :unique => true, :null => false, :size => 100
+    String :pid, :unique => false, :null => false, :size => 100
     String :app, :unique => false, :null => false, :size => 30
     String :message, :unique => false, :null => false, :size => 107
     Time :created_at
     index [:pid, :app, :message]
   end
 else
-  $DB = Sequel.connect("sqlite://#{Dir.pwd}/ass-#{$model}.db")
+  $DB = Sequel.connect("sqlite://#{Dir.pwd}/ass-#{$mode}.db")
 end
 
 WillPaginate.per_page = 10
 
-# Token = $DB[:tokens]
-# Push = $DB[:pushes]
-
 class Token < Sequel::Model
   Sequel.extension :pagination
-
-  # here is your code
 end
 
 class Push < Sequel::Model
   Sequel.extension :pagination
-
-  # here is your code
 end
 
 ############################################################
@@ -169,6 +165,9 @@ end
 ############################################################
 
 class App < Sinatra::Base
+  
+  register Sinatra::Synchrony
+
   use Rack::MobileDetect
 
   set :root, File.expand_path('../../', __FILE__)
@@ -177,14 +176,33 @@ class App < Sinatra::Base
   set :views, File.dirname(__FILE__) + '/../views'
 
   helpers do
-    
+
+    def checkFlood?(req)
+      if $client_ip != "#{req.ip}" then
+        $client_ip = "#{req.ip}"
+        return false
+      else
+        if $last_access == 0 then
+          return false
+        else
+          return isFlood?
+        end
+      end      
+    end
+
+    def isFlood?
+        result = (Time.now - $last_access) < $flood * 60
+        $last_access = Time.now
+        return result
+    end
+
     def iOS? 
-      ret = case request.env['X_MOBILE_DEVICE']
+      result = case request.env['X_MOBILE_DEVICE']
             when /iPhone|iPod|iPad/ then
               true
             else false
             end
-      return ret     
+      return result     
     end
 
     def authorized?
@@ -198,7 +216,6 @@ class App < Sinatra::Base
         throw(:halt, [401, "Oops... we need your login name & password\n"])
       end
     end
-
   end  
 
   configure :production, :development do
@@ -273,13 +290,14 @@ class App < Sinatra::Base
 
     ## register token api
     get "/v1/apps/#{app}/:token" do
-      if (("#{params[:token]}".length == 64) and iOS? ) then
+      if (("#{params[:token]}".length == 64) and iOS? and checkFlood?(request) ) then
         puts "[#{params[:token]}] was added to '#{app}'" if "#{$mode}".strip == 'development'
         o = Token.first(:app => app, :token => params[:token])
         unless o
           Token.insert(
               :app => app,
-              :token => params[:token]
+              :token => params[:token],
+              :created_at => Time.now
           )
         end
       end
@@ -304,6 +322,9 @@ class App < Sinatra::Base
       @exist = Push.first(:pid => "#{pid}", :app => "#{app}")
 
       unless @exist
+        
+        Push.insert(:pid => pid, :message => message, :created_at => Time.now, :app => "#{app}" )
+
         openSSLContext = $certkey["#{app}"]
         # Connect to port 2195 on the server.
         sock = nil
@@ -315,8 +336,7 @@ class App < Sinatra::Base
         # do our SSL handshaking
         sslSocket = OpenSSL::SSL::SSLSocket.new(sock, openSSLContext)
         sslSocket.connect
-        #Push.create( :pid => pid )
-        Push.insert(:pid => pid, :message => message, :created_at => Time.now, :app => "#{app}" )
+
         # write our packet to the stream
         @tokens.each do |o|
           tokenText = o[:token]
@@ -349,6 +369,9 @@ class App < Sinatra::Base
       @exist = Push.first(:pid => "#{pid}", :app => "#{app}")
 
       unless @exist
+
+        Push.insert(:pid => pid, :message => message, :created_at => Time.now, :app => "#{app}" )   
+
         openSSLContext = $certkey["#{app}"]
         # Connect to port 2195 on the server.
         sock = nil
@@ -360,8 +383,7 @@ class App < Sinatra::Base
         # do our SSL handshaking
         sslSocket = OpenSSL::SSL::SSLSocket.new(sock, openSSLContext)
         sslSocket.connect
-        #Push.create( :pid => pid )
-        Push.insert(:pid => pid, :message => message, :created_at => Time.now, :app => "#{app}" )        
+     
         # write our packet to the stream
         @tokens.each do |o|
           tokenText = o[:token]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ass
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -203,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -474,7 +490,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -403176201839861688
+      hash: -3291505526784258788
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: