app/controllers/apps_controller.rb app/helpers/apps_helper.rb app/models/upload.rb app/views/apps/_list.html.erb app/views/apps/index.html.erb app/views/apps/manage.html.erb app/views/apps/new.html.erb app/views/apps/show.html.erb db/migrate/20080413220608_create_uploads.rb db/migrate/20080413220918_add_upload_token_to_users.rb lib/appdrop_upload.rb log/mongrel.pid spec/controllers/apps_controller_spec.rb spec/fixtures/guestbook.tar.gz spec/fixtures/guestbook/app.yaml spec/fixtures/guestbook/guestbook.py spec/fixtures/invalid/app.yaml spec/fixtures/invalid/guestbook.py spec/fixtures/uploads.yml spec/helpers/apps_helper_spec.rb spec/models/appdrop_upload_spec.rb spec/models/upload_spec.rb uploads/0000/0001/guestbook.tar.gz vendor/plugins/attachment_fu @@ -23,12 +23,12 @@ views control panel for your app maybe just mount the google dev console here? -/apps - browse apps - -/apps/fug-this - public info page for app - link to app +# /apps +# browse apps +# +# /apps/fug-this +# public info page for app +# link to app ==== README @@ -2,29 +2,90 @@ require 'ftools' class App < ActiveRecord::Base + APP_ROOT = "/var/apps" + class FileError < StandardError; end; + validates_uniqueness_of :key validates_uniqueness_of :port validates_presence_of :key - validates_presence_of :port + # validates_presence_of :port validates_presence_of :user_id validates_format_of :key, :with => /\A[\-a-z0-9]*\Z/ validates_length_of :key, :in => (1..32) - validates_inclusion_of :port, :in => (3000..65535) + validates_inclusion_of :port, :in => (3000..65535), :allow_nil => true belongs_to :user + after_create :do_setup + + def to_param + key + end + + def do_setup + set_port + initialize_configuration + end + + def set_port + return if self.port + transaction do + a = App.find :first, :order => 'port desc', :conditions => ['id != ?', self.id] + self.update_attribute :port, a.port + 1 + end + end + def initialize_configuration make_app_dirs create_portfile nginx_config end + def update_code(tarfile) + untar_to_tmpdir(tarfile) + fileappkey = validate_appfiles + raise FileError, "Invalid application key in tarfile" unless fileappkey == self.key + replace_app_with_new + end + + def replace_app_with_new + tmpdir = "#{APP_ROOT}/#{key}/tmpapp" + appdir = "#{APP_ROOT}/#{key}/app" + # File.copy(tmpdir, appdir) + `rm -rf #{appdir}` + `mv #{tmpdir} #{appdir}` + end + + def untar_to_tmpdir(tarfile) + tmpdir = "#{APP_ROOT}/#{key}/tmpapp" + `rm -rf #{tmpdir}` + File.makedirs tmpdir + tarc = "tar --file #{tarfile} --force-local -C #{tmpdir} -zx" + success = system(tarc) + raise FileError, "Filesystem error with #{tarc}" unless success + end + + def validate_appfiles + tmpdir = "#{APP_ROOT}/#{key}/tmpapp" + yamls = ["#{tmpdir}/app.yaml", "#{tmpdir}/app.yml"] + appid = nil + unless yamls.any? do |file| + if File.exists?(file) + parse = File.open(file) { |yf| YAML::load( yf ) } + appid = parse['application'] if parse['application'] + end + end + raise FileError, "Directory #{tmpdir} does not contain a valid app.yaml or app.yml" + end + return appid + end + def make_app_dirs - File.makedirs "/var/apps/#{key}/app", "/var/apps/#{key}/data", "/var/apps/#{key}/log" + File.makedirs "#{APP_ROOT}/#{key}/app", "#{APP_ROOT}/#{key}/data", "#{APP_ROOT}/#{key}/log", "#{APP_ROOT}/#{key}/tmpapp" end def create_portfile - File.open("/var/apps/#{key}/portfile",'w') do |f| + File.open("#{APP_ROOT}/#{key}/portfile",'w') do |f| f.write port end end @@ -34,7 +95,7 @@ class App < ActiveRecord::Base server { listen 80; server_name #{key}.appdrop.com; - access_log /var/apps/#{key}/log/access.log; + access_log #{APP_ROOT}/#{key}/log/access.log; location / { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; app/models/app.rb @@ -7,7 +7,7 @@ module AuthenticatedBase base.set_table_name base.name.tableize - base.validates_presence_of :email + # base.validates_presence_of :email base.validates_presence_of :password, :if => :password_required? base.validates_presence_of :password_confirmation, :if => :password_required? base.validates_length_of :password, :within => 4..40, :if => :password_required? app/models/authenticated_base.rb @@ -23,6 +23,7 @@ class User < ActiveRecord::Base # has_many :images, :as => :attachable # composed_of :tz, :class_name => 'TZInfo::Timezone', :mapping => %w( time_zone time_zone ) + validates_presence_of :email validates_format_of :nickname, :with => /\A[\-a-z0-9A-Z\s]*\Z/ validates_format_of :email, :with => /^[_\w\d+-]+(\.[_\w\d-]+)*@[^\.@][\w\d\.-]+$/ @@ -30,6 +31,12 @@ class User < ActiveRecord::Base # Protect internal methods from mass-update with update_attributes attr_accessible :nickname, :email, :password, :password_confirmation, :time_zone + include TokenGenerator + before_create :set_upload_token + + def set_upload_token + set_token(24) + end def to_param email app/models/user.rb @@ -25,7 +25,7 @@ ActionController::Routing::Routes.draw do |map| # See how all your routes lay out with "rake routes" - map.resources :apps + map.resources :apps, :member => {:manage => :get, :upload => :post} map.root :controller => "pages" config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20080412232335) do +ActiveRecord::Schema.define(:version => 20080413220918) do create_table "apps", :force => true do |t| t.integer "user_id" @@ -32,6 +32,16 @@ ActiveRecord::Schema.define(:version => 20080412232335) do t.datetime "updated_at" end + create_table "uploads", :force => true do |t| + t.integer "user_id" + t.integer "app_id" + t.string "content_type" + t.string "filename" + t.integer "size" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "users", :force => true do |t| t.string "nickname" t.string "email" @@ -44,6 +54,9 @@ ActiveRecord::Schema.define(:version => 20080412232335) do t.datetime "remember_token_expires_at" t.integer "visits_count", :default => 0 t.string "permalink" + t.string "token" end + add_index "users", ["token"], :name => "index_users_on_token" + end db/schema.rb @@ -17,8 +17,7 @@ Confidence builder: AppDrop is a proof-of-concept, made to show that the AppEngine platform released by Google is not closed, and could easily be supported by other hosts. Unlike Google's project, we make no claims to be able to scale beyond a small amount of traffic. In fact, at AppDrop we reserve the right to shut the whole thing down any time we feel like it. We're running on EC2, so our virtual machine could just disappear at any time. We hope you enjoy AppDrop. If we see enough demand, we might decided to make serious go at it. Only time will tell. <h2>Lock in, we don't need no stinking lock in!</h2> Use at your own risk! Our current implementation makes no claims to be a finished product. For that reason, we're doing the simplest thing that could possibly work on most fronts. This means that we've pretty much ignored security concerns, so for the time being please don't upload any applications that deal in sensitive data. Also, we've yet to enable email support. This application and the EC2 Image that support it will be released for you to play with soon enough, so if email support, database scaling, or more secure logins are important to you, you'll have the opportunity to implement them yourself. -Hacked together by <a href="http://jchris.mfdz.com">Chris Anderson</a> with moral support from <a href="http://bottlecaplabs.net/">Bottlecap Labs</a>. <a href="https://github.com/jchris/portable-google-app-engine-sdk/tree/master">Download the Modified App Angine SDK</a> or <a href="https://github.com/jchris/appdrop/tree/master">get the source code for this Rails app management console.</a> - +Hacked together by <a href="http://jchris.mfdz.com">Chris Anderson</a> with moral support from <a href="http://bottlecaplabs.net/">Bottlecap Labs</a>. <a href="https://github.com/jchris/portable-google-app-engine-sdk/tree/master">Download the Modified App Engine SDK</a> or <a href="https://github.com/jchris/appdrop/tree/master">get the AppDrop.com source code (the Rails app you're looking at)</a>. </div> </body> </html> \ No newline at end of file public/index.html @@ -1,7 +1,9 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# one: -# column: value +one: + user_id: 1 + key: danger + port: 3000 # # two: # column: value spec/fixtures/apps.yml @@ -10,6 +10,57 @@ describe App do end end +describe App, "on create" do + fixtures :apps + it "should set the port to the next port" do + a = App.create :key => 'thisapp', :user_id => 5 + a.should be_valid + a.created_at.should_not be_nil + a.port.should == 3001 + end +end + +describe App, "update_code with a matching tarfile" do + fixtures :apps + before(:each) do + raise "OMFG don't run me on the production server!" if (/nginx/.match `ls /etc/nginx`) + `rm /etc/nginx/sites-enabled/*` + `rm -rf /var/apps/*` + @app = App.create! :key => 'guestbook', :user_id => 5 + `echo 'junk' > /var/apps/guestbook/app/app.yaml` + @tarfile = "#{RAILS_ROOT}/spec/fixtures/guestbook.tar.gz" + end + it "should have setup" do + ls = `ls /var/apps/guestbook` + ls.should match(/tmpapp/) + appf = `ls /var/apps/guestbook/app` + appf.should match(/app.yaml/) + end + it "should untar the tarball to the tmpapp directory" do + @app.stub!(:replace_app_with_new) + @app.update_code @tarfile + File.exists?("#{App::APP_ROOT}/guestbook/tmpapp/app.yaml").should be_true + end + it "should copy the new dir over the old directory" do + @app.update_code @tarfile + IO.readlines("#{App::APP_ROOT}/guestbook/app/app.yaml")[0].should match(/guestbook/) + end + it "should ensure that it is running" +end + +describe App, "update_code with a mismatched tarfile" do + before(:each) do + raise "OMFG don't run me on the production server!" if (/nginx/.match `ls /etc/nginx`) + `rm /etc/nginx/sites-enabled/*` + `rm -rf /var/apps/*` + @app = App.create! :key => 'notguestbook', :user_id => 5 + @tarfile = "#{RAILS_ROOT}/spec/fixtures/guestbook.tar.gz" + end + it "should fail" do + lambda{@app.update_code @tarfile}.should raise_error(App::FileError) + end +end + describe App, "initializing configuration" do before(:each) do raise "OMFG don't run me on the production server!" if (/nginx/.match `ls /etc/nginx`) @@ -28,6 +79,7 @@ describe App, "initializing configuration" do ls.should match(/log/) ls.should match(/data/) ls.should match(/app/) + ls.should match(/tmpapp/) end it "should set a portfile" do @app.initialize_configuration spec/models/app_spec.rb @@ -18,5 +18,9 @@ describe "A User" do @user.created_at.should == ca end + it "should set an upload token" do + @user.save + @user.token.should_not be_nil + end end spec/models/user_spec.rb @@ -9,7 +9,7 @@ module TokenGenerator token end - def set_token - self.token = generate_token { |token| self.class.find_by_token(token).nil? } + def set_token(size = 12) + self.token = generate_token(size) { |token| self.class.find_by_token(token).nil? } end end vendor/plugins/token_generator/lib/token_generator.rb 3a27c76c66fa5542b619884720cf97baa58b40ac Chris Anderson jchris@grabb.it http://github.com/jchris/appdrop/commit/798e4cdbd41260cea777d85db0728a5184c8a709 798e4cdbd41260cea777d85db0728a5184c8a709

2008-04-13T19:04:22-07:00

upload managment and script c73f78b11c37f86a0a07582f0aa047961a1f8484 Chris Anderson jchris@grabb.it