diff --git a/.env b/.env new file mode 100644 index 00000000..375b60d7 --- /dev/null +++ b/.env @@ -0,0 +1,5 @@ +RAILS_ENV=development +WEB_CONCURRENCY=1 +MAX_THREADS=4 +SECRET_TOKEN=temp +SECRET_KEY_BASE=temp diff --git a/.gitignore b/.gitignore index caa5349b..5b04c2f8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ # Ignore tern files \.tern-port -/coverage/ \ No newline at end of file +/coverage/ +/data/**/ diff --git a/.travis.yml b/.travis.yml index 1614cb04..212c9581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,16 @@ -language: ruby -rvm: - - 2.2.3 -before_install: - - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 - - tar -xjf phantomjs-2.0.0-ubuntu-12.04.tar.bz2 - - sudo rm -rf /usr/local/phantomjs/bin/phantomjs - - sudo mv phantomjs /usr/local/phantomjs/bin/phantomjs -before_script: - - psql -c 'create database "yacs-test";' -U postgres \ No newline at end of file +sudo: required + +services: + - docker + +env: + - RAILS_ENV=test + +install: + - bin/yacs-build + - bin/yacs-startd && docker ps + - sleep 10 + - bin/yacs-dbsetup + +script: + - bin/yacs-test diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..902c9ffd --- /dev/null +++ b/Dockerfile @@ -0,0 +1,26 @@ +FROM ruby:2.2.3 + +MAINTAINER Richie Young + +RUN apt-get update && apt-get install -qq -y build-essential nodejs wget --fix-missing --no-install-recommends + +ENV PHANTOMJS_VERSION 2.1.1 +RUN \ + apt-get install -y vim git wget libfreetype6 libfontconfig bzip2 && \ + wget -q --no-check-certificate -O /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 https://github.com/paladox/phantomjs/releases/download/2.1.7/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ + tar -xjf /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C /tmp && \ + rm -f /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 && \ + mv /tmp/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin/phantomjs /usr/bin/phantomjs + +ENV INSTALL_PATH /usr/src/app/ +RUN mkdir -p $INSTALL_PATH +RUN mkdir -p /var/run/puma + +WORKDIR $INSTALL_PATH +COPY Gemfile Gemfile.lock $INSTALL_PATH + +RUN bundle install +COPY . $INSTALL_PATH + +RUN mkdir -p /etc/puma/ssl +COPY nginx/ssl/ /etc/puma/ssl/ diff --git a/Gemfile.lock b/Gemfile.lock index 61a5bbb3..652eb7d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,8 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) arel (6.0.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) @@ -48,7 +49,7 @@ GEM byebug (2.7.0) columnize (~> 0.3) debugger-linecache (~> 1.2) - capybara (2.10.1) + capybara (2.10.2) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -61,13 +62,13 @@ GEM coderay (1.1.1) columnize (0.9.0) concurrent-ruby (1.0.2) - coveralls (0.8.15) + coveralls (0.8.16) json (>= 1.8, < 3) simplecov (~> 0.12.0) - term-ansicolor (~> 1.3) + term-ansicolor (~> 1.3.0) thor (~> 0.19.1) tins (>= 1.6.0, < 2) - crono (1.0.3) + crono (1.1.2) activerecord (>= 4.0) activesupport (>= 4.0) cucumber (2.4.0) @@ -110,11 +111,11 @@ GEM sprockets (>= 2.0.0) tilt (>= 1.2) i18n (0.7.0) - jbuilder (2.6.0) + jbuilder (2.6.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) json (1.8.3) - libv8 (3.16.14.15) + libv8 (3.16.14.17) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) @@ -124,17 +125,17 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - minitest (5.9.1) + minitest (5.10.1) multi_json (1.12.1) multi_test (0.1.2) - newrelic_rpm (3.16.3.323) + newrelic_rpm (3.17.1.326) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) pg (0.19.0) pickle (0.5.1) cucumber (>= 0.8) rake - poltergeist (1.10.0) + poltergeist (1.11.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -151,8 +152,9 @@ GEM pry-stack_explorer (0.4.9.2) binding_of_caller (>= 0.7) pry (>= 0.9.11) + public_suffix (2.0.4) puma (2.16.0) - rack (1.6.4) + rack (1.6.5) rack-test (0.6.3) rack (>= 1.0) railroady (1.5.2) @@ -211,7 +213,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selenium-webdriver (2.53.4) + selenium-webdriver (3.0.3) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) @@ -230,18 +232,18 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - term-ansicolor (1.4.0) + term-ansicolor (1.3.2) tins (~> 1.0) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thor (0.19.1) + thor (0.19.4) thread_safe (0.3.5) tilt (2.0.5) - tins (1.12.0) + tins (1.13.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.2) + uglifier (3.0.4) execjs (>= 0.3.0, < 3) web-console (2.3.0) activemodel (>= 4.0) @@ -293,4 +295,4 @@ DEPENDENCIES web-console (~> 2.0) BUNDLED WITH - 1.11.2 + 1.10.6 diff --git a/app/views/api/v5/sections/_sections.json.jbuilder b/app/views/api/v5/sections/_sections.json.jbuilder index 29959de2..5078d70e 100644 --- a/app/views/api/v5/sections/_sections.json.jbuilder +++ b/app/views/api/v5/sections/_sections.json.jbuilder @@ -11,5 +11,8 @@ json.sections sections do |section| i += 1 end end + json.course_name section.course.name + json.course_number section.course.number + json.department_code section.course.department.code end -end \ No newline at end of file +end diff --git a/app/views/static/index.html.erb b/app/views/static/index.html.erb index 08a5585f..54ec41db 100644 --- a/app/views/static/index.html.erb +++ b/app/views/static/index.html.erb @@ -29,7 +29,7 @@
Inspired by Jeff Hui's YACS.
-
Yacs v0.8 - The Places You'll Go
+
Yacs v0.9 - One Box Life
We love feedback! Github diff --git a/bin/yacs-assets b/bin/yacs-assets new file mode 100755 index 00000000..dc649453 --- /dev/null +++ b/bin/yacs-assets @@ -0,0 +1,5 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +docker-compose run web rake assets:precompile && rm -f public/index.html +chmod -f a+r public/* || : diff --git a/bin/yacs-bash b/bin/yacs-bash new file mode 100755 index 00000000..317eefe1 --- /dev/null +++ b/bin/yacs-bash @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +docker-compose run web bash diff --git a/bin/yacs-build b/bin/yacs-build new file mode 100755 index 00000000..7a750224 --- /dev/null +++ b/bin/yacs-build @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +docker-compose build diff --git a/bin/yacs-dbsetup b/bin/yacs-dbsetup new file mode 100755 index 00000000..32f9a874 --- /dev/null +++ b/bin/yacs-dbsetup @@ -0,0 +1,5 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +mkdir -p data/potsgres +docker-compose run web bundle exec rake db:create db:migrate diff --git a/bin/yacs-generate-cert b/bin/yacs-generate-cert new file mode 100755 index 00000000..368d5aaa --- /dev/null +++ b/bin/yacs-generate-cert @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout nginx/ssl/yacs.key -out nginx/ssl/yacs.cer -subj "/C=US/ST=New York/L=Troy/O=RPI/OU=RCOS/CN=yacs.cs.rpi.edu" diff --git a/bin/yacs-run b/bin/yacs-run new file mode 100755 index 00000000..22295524 --- /dev/null +++ b/bin/yacs-run @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +docker-compose run web $@ diff --git a/bin/yacs-start b/bin/yacs-start new file mode 100755 index 00000000..5473e9ea --- /dev/null +++ b/bin/yacs-start @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +docker-compose up diff --git a/bin/yacs-startd b/bin/yacs-startd new file mode 100755 index 00000000..3ddf216f --- /dev/null +++ b/bin/yacs-startd @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +docker-compose up -d diff --git a/bin/yacs-stop b/bin/yacs-stop new file mode 100755 index 00000000..9d8be3b4 --- /dev/null +++ b/bin/yacs-stop @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +docker-compose stop diff --git a/bin/yacs-test b/bin/yacs-test new file mode 100755 index 00000000..f45fc171 --- /dev/null +++ b/bin/yacs-test @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +RAILS_ENV=test docker-compose run web bundle exec rake diff --git a/bin/yacs-update b/bin/yacs-update new file mode 100755 index 00000000..a7e106c8 --- /dev/null +++ b/bin/yacs-update @@ -0,0 +1,4 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +git pull origin diff --git a/bin/yacs-update-deploy b/bin/yacs-update-deploy new file mode 100755 index 00000000..81add3a8 --- /dev/null +++ b/bin/yacs-update-deploy @@ -0,0 +1,9 @@ +#!/bin/bash +cd $(dirname `readlink -f "$0"`)/../ + +bin/yacs-update +bin/yacs-build +bin/yacs-dbsetup +bin/yacs-stop +bin/yacs-assets +bin/yacs-startd diff --git a/config/database.yml b/config/database.yml index 5ff5c8e8..ed4deb96 100644 --- a/config/database.yml +++ b/config/database.yml @@ -8,6 +8,8 @@ default: &default adapter: postgresql pool: 5 timeout: 5000 + host: postgres + username: postgres development: <<: *default diff --git a/config/environments/development.rb b/config/environments/development.rb index b55e2144..125c595f 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -38,4 +38,5 @@ # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + end diff --git a/config/environments/production.rb b/config/environments/production.rb index b8cdbf05..02503c90 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -28,7 +28,6 @@ # Compress JavaScripts and CSS. config.assets.js_compressor = :uglifier - config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false diff --git a/config/puma.rb b/config/puma.rb index d7124405..81719682 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,23 +1,24 @@ # https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server -workers Integer(ENV['WEB_CONCURRENCY'] || 2) +workers Integer(ENV['WEB_CONCURRENCY'] || 4) threads_count = Integer(ENV['MAX_THREADS'] || 5) threads threads_count, threads_count preload_app! rackup DefaultRackup -port ENV['PORT'] || 3000 -environment ENV['RACK_ENV'] || 'development' +environment ENV['RAILS_ENV'] || 'development' -if ENV['DSTATEDIR'] - pidfile "#{ENV['DSTATEDIR']}puma.pid" - state_path "#{ENV['DSTATEDIR']}puma.state" - daemonize true -end +ssl_bind '0.0.0.0', '3000', { + key: "/etc/puma/ssl/yacs.key", + cert: "/etc/puma/ssl/yacs.cer" +} + +pidfile "/var/run/puma/puma.pid" +state_path "/var/run/puma/puma.state" on_worker_boot do # Worker specific setup for Rails 4.1+ # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot ActiveRecord::Base.establish_connection -end \ No newline at end of file +end diff --git a/config/secrets.yml b/config/secrets.yml index 3ee1018c..75b94de7 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -20,3 +20,4 @@ test: # instead read values from the environment. production: secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> + secret_token: <%= ENV["SECRET_TOKEN"] %> diff --git a/yacs-dev b/data/.keep similarity index 100% rename from yacs-dev rename to data/.keep diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 00000000..63559501 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +mkdir -p ./data/postgres +mkdir -p ./data/redis +mkdir -p ./tmp/pids/puma + +docker-compose down +docker-compose build +docker-compose run web rm public/index.html +docker-compose run web bundle exec rake db:create db:migrate +docker-compose run web bundle exec rake assets:precompile +docker-compose up -d diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..e442ce41 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,55 @@ +version: '2' + +services: + postgres: + image: postgres:9.5 + expose: + - "5432" + volumes: + - ./data/postgres:/var/lib/postgresql/data + + redis: + image: redis + expose: + - "6379" + volumes: + - ./data/redis/:/var/lib/redis/data/ + + nginx: + build: ./nginx + image: nginx:mainline + ports: + - "80:80" + - "443:443" + links: + - web + volumes: + - .:/usr/src/app/ + + web: + build: . + environment: + - RAILS_ENV=${RAILS_ENV} + - SECRET_KEY_BASE=${SECRET_KEY_BASE} + - SECRET_TOKEN=${SECRET_TOKEN} + - WEB_CONCURRENCY=${WEB_CONCURRENCY} + - MAX_THREADS=${MAX_THREADS} + volumes: + - .:/usr/src/app/ + depends_on: + - postgres + - redis + command: bundle exec puma -C config/puma.rb + expose: + - "3000" + + worker: + build: . + environment: + - RAILS_ENV=${RAILS_ENV} + volumes: + - .:/usr/src/app/ + depends_on: + - postgres + - redis + command: bundle exec crono diff --git a/nginx/Dockerfile b/nginx/Dockerfile new file mode 100644 index 00000000..54e8140e --- /dev/null +++ b/nginx/Dockerfile @@ -0,0 +1,5 @@ +FROM nginx + +MAINTAINER Mark Robinson + +COPY ./ /etc/nginx/ diff --git a/nginx/nginx.conf b/nginx/nginx.conf new file mode 100644 index 00000000..64604ae8 --- /dev/null +++ b/nginx/nginx.conf @@ -0,0 +1,147 @@ +worker_processes auto; + +events { + worker_connections 1024; + multi_accept on; + use epoll; +} + +http { + + upstream app { + server web:3000; + keepalive 64; + } + + server { + listen 80 default_server; + + server_name localhost; + + charset utf-8; + + # Redirect all HTTP requests to HTTPS with a 301 Moved Permanently response. + return 301 https://$host$request_uri; + } + + server { + listen 443 default_server ssl http2; + + server_name localhost; + + root /usr/src/app/public; + + charset utf-8; + + ssl_certificate /etc/nginx/ssl/yacs.cer; + ssl_certificate_key /etc/nginx/ssl/yacs.key; + + ssl_session_tickets off; + ssl_session_cache shared:SSL:50m; + ssl_session_timeout 1d; + + # ssl_stapling on; + # ssl_stapling_verify on; + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + + ssl_ciphers ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DES-CBC3-SHA:!DSS; + + ssl_prefer_server_ciphers on; + ssl_ecdh_curve secp384r1; + + # ssl_dhparam /etc/nginx/ssl/dhparam.pem; + + add_header Public-Key-Pins 'pin-sha256="atnjelwPipMfcOPjHY5X45Nrfm1Q2f+EzC1Pr36bnXM="; pin-sha256="b1JA6+4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28="; pin-sha256="x4QzPSC810K5/cMjb05Qm4k3Bw5zBn4lTdO/nEW/Td4="; pin-sha256="lCppFqbkrlJ3EcVFAkeip0+44VaoJUymbnOaEUk7tEU="; max-age=5184000;'; + + add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload;" always; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; script-src 'self' 'unsafe-inline' https://www.google-analytics.com https://js-agent.newrelic.com https://bam.nr-data.net; style-src 'self'; img-src 'self' https://www.google-analytics.com data:; font-src 'self' https://fonts.gstatic.com data:"; + + location @app { + proxy_pass https://app; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Verify SUCCESS; + proxy_set_header X-Client-DN $ssl_client_s_dn; + proxy_set_header X-SSL-Subject $ssl_client_s_dn; + proxy_set_header X-SSL-Issuer $ssl_client_i_dn; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 1800; + proxy_connect_timeout 1800; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_buffering off; + } + + location ~ /\. { + deny all; + } + + location ~* ^.+\.(rb|log)$ { + deny all; + } + + location ~ ^/(assets|images|javascripts|stylesheets|swfs|system)/ { + try_files $uri @app; + + access_log off; + gzip_static on; # to serve pre-gzipped version + + expires max; + add_header Cache-Control public; + + # Some browsers still send conditional-GET requests if there's a + # Last-Modified header or an ETag header even if they haven't + # reached the expiry date sent in the Expires header. + add_header Last-Modified ""; + add_header ETag ""; + break; + } + + location ~* \.(jpg|jpeg|png|gif|ico|css|js|woff|svg|html|xml)$ { + expires 30d; + } + + location / { + try_files $uri @app; + } + } + + access_log off; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + keepalive_requests 200; + keepalive_timeout 65; + reset_timedout_connection on; + + server_tokens off; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + + default_type application/octet-stream; + include /etc/nginx/mime.types; + + open_file_cache max=10000 inactive=30s; + open_file_cache_valid 60s; + open_file_cache_min_uses 2; + open_file_cache_errors on; + + gzip on; + gzip_static on; + gzip_comp_level 3; + gzip_min_length 256; + gzip_proxied no-cache no-store private expired auth; + gzip_types text/plain text/css image/png image/gif image/jpeg application/x-javascript text/xml application/xml application/x +ml+rss text/javascript; + gzip_vary on; + gzip_http_version 1.1; + gzip_disable "MSIE [1-6]\.(?!.*SV1)"; +} diff --git a/nginx/ssl/.gitignore b/nginx/ssl/.gitignore new file mode 100644 index 00000000..5e7d2734 --- /dev/null +++ b/nginx/ssl/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore