diff --git a/.ruby-version b/.ruby-version
index 2bf1c1c..005119b 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.1
+2.4.1
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c39edc9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,37 @@
+FROM debian:8
+MAINTAINER email@christoph-haas.de
+
+# Install apt based dependencies required to run Rails as
+# well as RubyGems. As the Ruby image itself is based on a
+# Debian image, we use apt-get to install those.
+RUN apt-get update && apt-get install -y \
+ build-essential ruby
+
+RUN apt-get install -y git
+RUN apt-get install -y rbenv
+
+# Configure the main working directory. This is the base
+# directory used in any further RUN, COPY, and ENTRYPOINT
+# commands.
+RUN mkdir -p /app
+WORKDIR /app
+
+# Copy the Gemfile as well as the Gemfile.lock and install
+# the RubyGems. This is a separate step so the dependencies
+# will be cached unless changes to one of those two files
+# are made.
+COPY Gemfile Gemfile.lock ./
+RUN gem install bundler && bundle install --jobs 20 --retry 5
+
+# Copy the main application.
+COPY . ./
+
+# Expose port 3000 to the Docker host, so we can access it
+# from the outside.
+EXPOSE 3000
+
+# The main command to run when the container starts. Also
+# tell the Rails dev server to bind to all interfaces by
+# default.
+CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]
+
diff --git a/README.developer.md b/README.developer.md
deleted file mode 100644
index dd912f2..0000000
--- a/README.developer.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Authentication
-
-The application uses _omniauth_ to allow local authentication for moderators
-and adds OAuth authentication to connect to Google+, Github and other
-authentication providers.
-
-Documentation on omniauth:
-
-https://github.com/omniauth/omniauth/wiki/List-of-Strategies
-https://github.com/plataformatec/devise/wiki/OmniAuth:-Overview
-
-List of strategies:
-
-https://github.com/omniauth/omniauth/wiki/List-of-Strategies
-
-## Google
-
-The client ID for the debshots and the private key must be set as environment
-variables before running the application:
-
-* GOOGLE_CLIENT_ID=…
-* GOOGLE_CLIENT_SECRET=…
-
-To manage OAuth applications at Google: https://console.developers.google.com/apis/credentials
-
-Authorized callback URLs must be set to:
-
-- https://screenshots.debian.net/users/auth/google_oauth2/callback
-- https://localhost:3001/users/auth/google_oauth2/callback
-
-## Amazon
-
-The client ID for the debshots and the secret must be set as environment
-variables before running the application:
-
-* AMAZON_CLIENT_ID=…
-* AMAZON_CLIENT_SECRET=…
-
-
-Client ID:
-
- amzn1.application-oa2-client.78d832919fc24456b0636762cf18efd9
-
-Client Secret:
-
- 8c495d0940ca4100313c03e93b8b4240eef256d2fdbe672718506f29f5a20f61
-
-Available login buttons: https://login.amazon.com/button-guide
-
-## Launchpad
-
-TODO
-
-## Github
-
-TODO
-
-## Caveats
-
-The OAuth callback handling uses Ruby's "faraday" library. Unfortunately
-Faraday may easily miss the directory where the common CAs are stored.
-So the path to the certificates on the system needs to be provided:
-
- config.omniauth :google_oauth2, '398593918966-0fpmit0pb6ptio1ndsie5dfcnqhei63l.apps.googleusercontent.com', 'uRQq_dLs1kx7l5sYIyEyPVRc', :client_options => {:ssl => {:ca_path => '/etc/ssl/certs'}}
-
-For another explanation of the issue see: https://gist.github.com/kt103099/3183125
-
-## Debian
-
-The Debian SSO service uses certificates to provide access for Debian developers.
-If the frontend web server (e.g. nginx) is told to allow optional authentication
-using SSL client certificates then a visitor gets requested to send a certificates
-if one is installed in the browser. Otherwise users just do not notice anything.
-
-Authentication can be tested by:
-
- cd nginx
- nginx -c `pwd`/nginx.conf
-
-(Ignore the warning about the error log file.)
-
-Then point your browser to: https://localhost:3001/
-
-The relevant part of the Nginx configuration:
-
- ssl_client_certificate debsso.crt;
- ssl_crl debsso.crl;
- ssl_verify_client optional;
-
-However the CRL (certificate revocation list) needs to be updated regularly.
-The appropriate update script can be found at:
-https://anonscm.debian.org/cgit/debian-sso/debian-sso.git/plain/update-debsso-ca
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5e65484
--- /dev/null
+++ b/README.md
@@ -0,0 +1,21 @@
+# Installation
+
+Install rbenv (https://github.com/rbenv/ruby-build#readme).
+
+Install required libraries:
+
+ sudo apt install libbz2-dev libpq-dev
+
+Install Bundler
+
+ gem install bundler
+
+Install the dependencies:
+
+ bundle
+
+Install a PostgreSQL server:
+
+ apt install postgresql
+
+C
diff --git a/app/assets/javascripts/admin.coffee b/app/assets/javascripts/admin.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/admin.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/my.coffee b/app/assets/javascripts/my.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/my.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
new file mode 100644
index 0000000..6b55735
--- /dev/null
+++ b/app/assets/stylesheets/admin.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the admin controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
new file mode 100644
index 0000000..c5fba20
--- /dev/null
+++ b/app/controllers/admin_controller.rb
@@ -0,0 +1,10 @@
+class AdminController < ApplicationController
+ def status
+ end
+
+ def screenshots
+ end
+
+ def integration
+ end
+end
diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb
index 16113f0..80ab8b6 100644
--- a/app/controllers/packages_controller.rb
+++ b/app/controllers/packages_controller.rb
@@ -57,11 +57,6 @@ class PackagesController < ApplicationController
# redirect_to package_path
end
- # Receive the descriptions from upload_review and update them
- def upload_review2
-
- end
-
# Legacy action to upload an image along with metadata.
# This was used in Debshots 1.x as the default upload method.
# This method allows that old-style way to upload screenshots.
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
new file mode 100644
index 0000000..d5c6d35
--- /dev/null
+++ b/app/helpers/admin_helper.rb
@@ -0,0 +1,2 @@
+module AdminHelper
+end
diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb
new file mode 100644
index 0000000..c8365c8
--- /dev/null
+++ b/app/helpers/my_helper.rb
@@ -0,0 +1,2 @@
+module MyHelper
+end
diff --git a/app/models/package.rb b/app/models/package.rb
index 5e9edc1..2da1678 100644
--- a/app/models/package.rb
+++ b/app/models/package.rb
@@ -82,6 +82,11 @@ class Package < ApplicationRecord
return sorted_screenshots.last
end
+ # Return the part of the version up to the first - or +
+ def upstream_version
+ self.version.split(/[\-\+]/).first
+ end
+
private
def version_compare(x,y)
diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb
index 6d2969c..95bedab 100644
--- a/app/models/screenshot.rb
+++ b/app/models/screenshot.rb
@@ -116,7 +116,7 @@ class Screenshot < ApplicationRecord
# Publish a screenshot from the moderation queue
def approve_screenshot!
-
+
self.delete_reason = nil
self.markedfordelete = false
self.approved = true
@@ -164,4 +164,9 @@ class Screenshot < ApplicationRecord
false
end
+ # Return the part of the version up to the first - or +
+ def upstream_version
+ self.version.split(/[\-\+]/).first
+ end
+
end
diff --git a/app/views/admin/integration.html.slim b/app/views/admin/integration.html.slim
new file mode 100644
index 0000000..b1546bc
--- /dev/null
+++ b/app/views/admin/integration.html.slim
@@ -0,0 +1,2 @@
+h1 Admin#integration
+p Find me in app/views/admin/integration.html.slim
diff --git a/app/views/admin/screenshots.html.slim b/app/views/admin/screenshots.html.slim
new file mode 100644
index 0000000..fd0abd2
--- /dev/null
+++ b/app/views/admin/screenshots.html.slim
@@ -0,0 +1,2 @@
+h1 Admin#screenshots
+p Find me in app/views/admin/screenshots.html.slim
diff --git a/app/views/admin/status.html.slim b/app/views/admin/status.html.slim
new file mode 100644
index 0000000..d41be8f
--- /dev/null
+++ b/app/views/admin/status.html.slim
@@ -0,0 +1,2 @@
+h1 Admin#status
+p Find me in app/views/admin/status.html.slim
diff --git a/app/views/my/profile.slim b/app/views/my/profile.slim
index 161628b..007f823 100644
--- a/app/views/my/profile.slim
+++ b/app/views/my/profile.slim
@@ -22,9 +22,6 @@
h2 Single-sign-on provider
p You logged in using #{current_user.pretty_provider}.
- h2 The first time you were here was
- p = current_user.created_at.to_formatted_s(:long_ordinal)
-
h2 Number of screenshots you uploaded
p = current_user.screenshots.count
diff --git a/app/views/packages/_details_rightbox.slim b/app/views/packages/_details_rightbox.slim
index 8db9469..86fb85c 100644
--- a/app/views/packages/_details_rightbox.slim
+++ b/app/views/packages/_details_rightbox.slim
@@ -39,7 +39,7 @@
p
- if pkg.visits > 0
' #{pkg.visits} other people were interested in this package here.
- ' The newest known version of this software is #{pkg.version}
+ ' The newest known version of this software is #{pkg.upstream_version}
- if pkg.updated_at
' (Information last updated #{time_ago_in_words(pkg.updated_at)} ago.)
// show which distributions have this package available
diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim
index 0b1a19c..0beb485 100644
--- a/app/views/packages/details.slim
+++ b/app/views/packages/details.slim
@@ -17,13 +17,13 @@
.imgcaption =screenshot.description
- if screenshot.version.present?
.imgcaption
- em from version #{screenshot.version}
- - if user_signed_in?
+ em from version #{screenshot.upstream_version}
+ - if user_signed_in? and current_user.is_admin?
.imgcaption
- em Admin status: #{screenshot.adminstatus}
+ span.label.secondary #{screenshot.adminstatus}
// Is the user an admin?
- - if user_signed_in?
+ - if user_signed_in? and current_user.is_admin?
= render(partial: 'admin_dropdown', locals: {screenshot: screenshot})
// or does the screenshot belong to the user (determined by session cookie)
- elsif screenshot.uploaderhash == session[:token]
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4153699..8b3a4c0 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -77,6 +77,6 @@ Rails.application.configure do
# config.file_watcher = ActiveSupport::EventedFileUpdateChecker
# Any action dealing with authentication should redirect to HTTPS
- config.to_prepare { Devise::SessionsController.force_ssl(port: 3001) }
+ #config.to_prepare { Devise::SessionsController.force_ssl(port: 3001) }
end
diff --git a/doc/README.Developer b/doc/README.Developer
deleted file mode 100644
index 407991e..0000000
--- a/doc/README.Developer
+++ /dev/null
@@ -1,93 +0,0 @@
-# Full text search
-
-The pg_search Ruby gem is used for full-text searched in Rails.
-See: https://github.com/Casecommons/pg_search
-
-Reformatted SQL query for fulltext search:
-
-SELECT COUNT(*) FROM "packages" WHERE (
- (
- (
- to_tsvector('simple', coalesce("packages"."name"::text, ''))
- ||
- to_tsvector('simple', coalesce("packages"."description"::text, ''))
- ||
- to_tsvector('simple', coalesce("packages"."long_description"::text, ''))
- )
- @@
- (
- to_tsquery('simple', '''' || 'browser' || ' ''')
- )
- )
-)
-
-# Index:
-
-CREATE INDEX packages_gin ON packages USING GIN( (to_tsvector('simple',
-coalesce("packages"."name"::text, '')) || to_tsvector('simple',
-coalesce("packages"."description"::text, '')) || to_tsvector('simple',
-coalesce("packages"."long_description"::text, ''))) );
-
----------
-
-Used: https://github.com/semaperepelitsa/jquery.fileupload-rails
-Which is a gem for: https://github.com/blueimp/jQuery-File-Upload
-
-Paperclip for attachment/screenshot file handlind within ActiveRecord
-https://github.com/thoughtbot/paperclip
-
---
-
-Components:
-
-- Rails 5 (widespread, up-to-date, solves many common problems)
-- PostgreSQL (fast, easy, I don't like MySQL, good fulltext search)
-- Git (most people nowadays use Git)
-- jQuery (well known and easy to use)
-- Zurb Foundation (integrates nicer than Twitter Bootstrap)
-- Guard for automated testing (http://www.rubydoc.info/gems/guard-rails)
-
---
-
-Importer
-
-How Debian repositories are organized: https://wiki.debian.org/RepositoryFormat
-
---
-
-Logging from within the application into the database's "log" table:
-
-Log.log "foo"
-or with section (default='frontend'):
-Log.log "foo", "importer"
-
---
-
-To create admin users
----------------------
-
-rails c
-> User.new(email: 'email@christoph-haas.de', password: 'secret').save
-
----
-
-Multiple distributions (e.g. Ubuntu, Debian)
-- new table: distributions
- - id
- - name (e.g. "Debian")
- - description (e.g. "The Debian GNU/Linux distribution")
- - url (http://www.debian.org/)
- - type (apt, later: rpm)
- - logo
-
-- screenshots: new field for source_id
-
-Admin interface to manage sources
-
----
-
-AppStream data
-- screenshots: new field for type ('user-generated', 'upstream', 'logo')
- user-generated: uploaded by a random user
- upstream: official screenshot from the developer
- logo: not a screenshot - just a logo
diff --git a/doc/README.rdoc b/doc/README.rdoc
deleted file mode 100644
index 7a243f6..0000000
--- a/doc/README.rdoc
+++ /dev/null
@@ -1,449 +0,0 @@
-# Installing debshots the easy way using Ansible
-
-Prerequisites: A Debian Jessie server.
-
-Install PIP to get a recent version of Ansible:
-
- apt install python-pip
-
-Tun the Ansible playbook that comes with the debshots repository:
-
- cd ansible
- ansible-playbook debshost.yml
-
-_(If you get "command not found" then run "hash -r" or "rehash" in your
-shell and try again.)_
-
-
-# Installing debshots the manual way
-
-## Prepare PostgreSQL database server and user (ident-based authentication)
-
- apt install postgresql
- su - postgres
- createuser -d debshots
- createdb -O debshots -E UTF8 -T template0 debshots
-
-## Create an application user
-
- adduser debshots
-
-Allow the user to parse access log files from Nginx:
-
- adduser debshots adm
- su - debshots
-
-## Install the required Ruby version using rbenv
-
-Documentation: https://github.com/rbenv/rbenv
-
- git clone https://github.com/rbenv/rbenv.git ~/.rbenv
- echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bash_profile
-
-# Load rbenv automatically by appending
-# the following to ~/.profile:
-
- eval "$(rbenv init -)"
-
-Install the "rbenv install" add-on:
-
-Documentation: https://github.com/rbenv/ruby-build#readme
-
- git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
-
-Install the "rbenv vars" add-on:
-
- cd ~/.rbenv/plugins
- git clone https://github.com/sstephenson/rbenv-vars.git
-
-## Get the application
-
-Clone the debshots Git repository.
-
-## Install the Ruby dependencies
-
- rbenv install
- echo "gem: --no-rdoc --no-ri" > ~/.gemrc
- gem install bundler
- bundle install --deployment
-
-## Optional: copy screenshots and database from the live website
-
- scp screenshots.debian.net:debshots-screenshots.tar .
- tar -C public/ -xvf debshots-screenshots.tar
- scp screenshots.debian.net:debshots.sql .
- psql debshots < debshots.sql
-
-## Switch to production environment
-
- export RAILS_ENV=production
-
-## Migrate database
-
- bundle exec rake db:migrate RAILS_ENV=production
-
-In config/database.yml: production: user/password/host must be commented out
-
-## Pre-render the static assets
-
- bundle exec rake assets:precompile RAILS_ENV=production
-
-## Test the application:
-
- bundle exec rails s -b 0.0.0.0 -e production
-
-Point your browser to http://...:3000/ and check the web site.
-
-## Create a user for moderation:
-
-Start a Rails console:
-
- bundle exec rails c -e production
-
-Create a new user record:
-
- user = User.create(realname: 'Christoph Haas', password: 'foobartest', email: 'email@christoph-haas.de')
- user.save!
-
-## Tidy up the screenshot data
-
- bundle exec rake debshots:remove_broken_screenshots
- bundle exec rake debshots:remove_duplicate_images
-
-## Import new package information
-
- bundle exec rake debshots:list_deb_repos
- bundle exec rake debshots:update_from_deb_repos
- bundle exec debshots:update_longdescription_from_deb_repos
-
-
-
-# Prepare production environment
-
-## Install passenger to run the application behind nginx
-
-Use the Ansible playbook to install Phusion Passenger - the component
-that makes the actual Ruby on Rails web application accessible from
-the Nginx web server.
-
-## Example nginx vhost config
-
- more_clear_headers 'X-Runtime';
- more_clear_headers 'X-Powered-By';
- more_clear_headers 'Server';
- server_tokens off;
-
- proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=my_cache:10m max_size=10g inactive=60m use_temp_path=off;
-
- log_format proxy '[$time_local] Cache: $upstream_cache_status $upstream_addr $upstream_response_time $status $bytes_sent $remote_addr $request_uri "$http_referer" "$http_user_agent" $scheme';
-
- # Performance
- passenger_max_pool_size 8;
- passenger_max_request_queue_size 200;
-
- limit_req_zone $binary_remote_addr zone=one:20m rate=5r/s;
-
- # Frontend caching and static asset delivery
- server {
- listen 85.25.83.22:80 default_server;
- listen 85.25.83.22:443 ssl;
- ssl_certificate /etc/letsencrypt/live/screenshots.debian.net/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/screenshots.debian.net/privkey.pem;
-
- root /home/debshots/debshots/public;
- server_name _;
- access_log /var/log/nginx/cache-access.log proxy;
-
- add_header X-Cache-Status $upstream_cache_status;
-
- # Tell the backend if the protocol used was HTTPS. Otherwise you get an infinite
- # redirection loop because the backend assumes that HTTP was spoken behind the
- # proxy.
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
- # Pass on the actual HTTP_HOST ("Host:" header) so that Rails can build proper absolute URLs
- proxy_set_header Host $host;
- gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
- gzip_proxied any;
-
- location / {
- try_files /maintenance.html @backend;
- add_header X-Coffee front-main;
- }
-
- location /json/ {
- try_files /maintenance.html @backend;
- proxy_cache my_cache;
- proxy_pass http://127.0.0.1:8888/;
- proxy_cache_lock on;
- proxy_cache_use_stale updating;
- add_header X-Coffee front-json;
- }
-
- location /favicon.ico {
- alias /home/debshots/debshots/public/favicon.ico;
- }
-
- location @backend {
- proxy_cache my_cache;
- proxy_pass http://127.0.0.1:8888;
-
- # Avoid cache stampede - rather update once and deliver stale content
- proxy_cache_lock on;
- proxy_cache_use_stale updating;
- add_header X-Coffee front-rails;
- }
-
- location /assets/ {
- alias /home/debshots/debshots/public/assets/;
- expires 1h;
- add_header X-Coffee front-assets;
- }
- location /logo/ {
- alias /home/debshots/debshots/public/logo/;
- expires 1h;
- add_header X-Coffee front-logo;
- }
- location /screenshots/ {
- alias /home/debshots/debshots/public/screenshots/;
- expires max;
- add_header X-Coffee front-screenshots;
- }
- location /images/ {
- alias /home/debshots/debshots/public/images/;
- expires 1h;
- add_header X-Coffee front-images;
- }
- }
-
- # Backend rails application
- server {
- listen 127.0.0.1:8888;
-
- root /home/debshots/debshots/public;
-
- server_name _;
- access_log /var/log/nginx/rails-access.log;
-
- passenger_enabled on;
- passenger_ruby /home/debshots/.rbenv/versions/2.3.1/bin/ruby;
-
-
- # Send thumbnails using X-Sendfile / X-Accel-Redirect
- # The correct thumbnail is computed by the Rails application so it cannot be served directly.
- location /thumbnail/ {
- expires 1h;
- proxy_cache_valid 404 15m;
- add_header X-Coffee back-thumbnail;
- limit_req zone=one burst=30;
- }
-
- # Send public assets using X-Sendfile / X-Accel-Redirect (e.g. public/images/dummy/...)
- location /public/ {
- expires 1h;
- add_header X-Coffee back-public;
-
- passenger_set_header X-Sendfile-Type X-Accel-Redirect;
- passenger_env_var HTTP_X_ACCEL_MAPPING /home/debshots/debshots/public/=/__send_file_accel/;
- passenger_pass_header X-Accel-Redirect;
- }
-
- location /__send_file_accel/ {
- internal;
- alias /home/debshots/debshots/public/;
- add_header X-Coffee back-accel;
- expires 1d;
- more_clear_headers 'Set-Cookie';
- }
-
- location /secretstatus {
- stub_status;
- access_log off;
- allow all;
- add_header X-Coffee back-status;
- }
- }
-
-
-# Supported URL paths (aka routes)
-
-_For up-to-date information please check config/routes._
-
-/screenshots/:package_inital/:package/:(id)_:size.png
-* package = name of the package
-* id = numerical ID of the screenshot
-* size = "large" or "small"
-* Returns a PNG image of a screenshot
-* Should be served as a static asset
-
-/image/:(id)_:size.png
-* id = numerical ID of the screenshot
-* size = "large" or "small"
-* Returns a PNG image of a screenshot
-* Usually used for unapproved images that should just be shown to the uploader
-
-/about
-* Return an informational HTML page
-
-/packages
-* Return a list of packages with pagination
-
-/packages/with_screenshots
-* Return a list of packages with pagination
-* Select only those packages that have screenshots.
-
-/packages/without_screenshots
-* Return a list of packages with pagination
-* Select only those packages that do not have screenshots.
-
-/packages/games_without_screenshots (deprecated)
-* Return a list of packages with pagination
-* Select only those packages that belong to Debian's "games" section
-
-/json/packages
-* Return a JSON data structure of all packages
-
-/json/screenshots
-* Return a JSON data structure containing packages and screenshots
-
-/json/packages-without-screenshots
-* Return a JSON data structure of those packages that do not have any screenshots
-
-/packages/moderate
-* Return a HTML page showing packages that need moderation
-* Must only be available to logged in moderators
-
-/upload
-* Return a HTML page containing an upload form for new screenshots
-
-/guidelines (deprecated)
-* Return a HTML page showing general guidelines for creating screenshots
-* Should just redirect to the /upload page
-
-/upload/:package
-* ??
-
-/uploadfile
-* ??
-
-/login
-* Show a login form
-
-/logout
-* Logout the user by invalidating the cookie session.
-
-/package/:package
-* Show details of a certain package
-
-/json/package/:package
-* Return a JSON data structure containing details of a certain package
-
-/thumbnail/:package
-/thumbnail-404/:package (deprecated)
-* Return a small (160x120 pixel) PNG screenshot file of a package
-* If the package does not have any screenshots then return a 404 code
-
-/thumbnail-with-version/:package/:version
-* Return a small (160x120 pixel) PNG screenshot file of a package
-* If the package does not have any screenshots then return a 404 code
-* Prefer screenshots of a certain version
-
-/screenshot/:package
-/screenshot-404/:package (deprecated)
-* Return a large (320x240 pixel) PNG screenshot file of a package
-* If the package does not have any screenshots then return a 404 code
-
-/screenshot-with-version/:package/:version
-* Return a large (320x240 pixel) PNG screenshot file of a package
-* If the package does not have any screenshots then return a 404 code
-* Prefer screenshots of a certain version
-
-/delete_screenshot/:screenshot
-* Users: request deletion of a screenshot
-* Moderators: delete a screenshot
-
-/approve_screenshot/:screenshot
-* Users: 403
-* Moderators: approve a screenshot
-
-/keep_screenshot/:screenshot
-* Users: 403
-* Moderators: re-approve a screenshot that was requested for deletion
-
-## Cron jobs
-
-Parse Nginx access logs to count the number of visits of each package:
-
- RAILS_ENV=production bundle exec rake debshots:accesslog2visits[/var/log/nginx/cache-access.log.1]
-
-As a cron job:
-
- 41 9 * * * cd $HOME/debshots ; RAILS_ENV=production /home/debshots/.rbenv/shims/bundle exec rake debshots:accesslog2visits[/var/log/nginx/cache-access.log.1]
-
-
-# Authentication
-
-This web application tries to avoid to create yet another directory
-of user accounts. So it leverages other common web sites like StackExchange,
-Debian SSO (using browser/client certificates) or GitHub as single-sign-on
-services. It is still possible to create local user accounts for administrators
-but registration is disabled.
-
-Anonymous uploads are possible but they have to be moderated by an administrator.
-
-# Authorization
-
-A user can have one of these access levels.
-
-## Anonymous
-
-Without authentication all user actions are moderated. Such users can upload
-screenshots or report existing/published screenshots as inappropriate. However
-a user with level 'admin' will have to approve that action.
-
-## Authenticated by single-sign-login (SSO)
-
-Users can use different authentication services to login - like Github or
-StackExchange. Such users internally get an account with a random password
-created but they will keep logging in via SSO.
-
-The first upload will have to be moderated. Subsequent uploads will be
-approved automatically.
-
-## Authenticated by Debian signle-sign-login (SSO)
-
-If a user authenticates using a Debian SSO client certificate they will be
-able to upload screenshots without moderation.
-(Anohter idea was to restrict them to uploading only screenshots for the
-packages they maintain. But that may be reliable and is not implemented at
-this time.)
-
-## Administrator
-
-Such a user has an internal user account. The database record has the
-'admin' field set to 1. Admins can freely upload, moderate and delete
-screenshots. They can also read the log files.
-
-
-# Nginx during development
-
-During development it is advised to run Nginx to proxy ports 3000 (HTTP)
-and 3001 (HTTPS) to the rails application.
-
- cd nginx
- nginx -c `pwd`/nginx.conf
-
-The SSL certitificate is just a self-signed certificate with the
-common name "localhost". It was generated using:
-
- openssl req -x509 -newkey 4096 -nodes -keyout localhost.key -out localhost.crt -days 3650
-
-Run "rails s" in another window. That will use the built-in Ruby 'Puma'
-application server that can also be used in production. It requires less
-configuration than Phusion Passenger but may be slower in regard to
-performance and multi-threading / multi-core support.
-
-If you get "400 Bad Request / The SSL certificate error" in the browser then
-please check the error log (/tmp/error*). Once cause is that the CRL of
-the Debian SSO has expired and needs to be updated.
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
deleted file mode 100644
index 26c9eaf..0000000
--- a/nginx/nginx.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-events {
- worker_connections 768;
-}
-
-pid /tmp/nginx.pid;
-error_log /tmp/error info;
-
-http {
- include mime.types;
- default_type application/octet-stream;
-
- ssl_dhparam dhparams.pem;
-
- ##
- # Logging Settings
- ##
-
- access_log /tmp/access-main;
- error_log /tmp/error-main info;
-
- ##
- # Gzip Settings
- ##
-
- gzip on;
-
- server {
- listen *:3001 ssl;
- ssl_certificate localhost.crt;
- ssl_certificate_key localhost.key;
- ssl_client_certificate debsso.crt;
- ssl_crl debsso.crl;
- ssl_verify_client optional;
- ssl_verify_depth 1;
- proxy_set_header X-Debian-SSO-DN $ssl_client_s_dn;
-
- root ../public;
- server_name _;
- access_log /tmp/access-front;
- error_log /tmp/error-front info;
-
- # Tell the backend if the protocol used was HTTPS. Otherwise you get an infinite
- # redirection loop because the backend assumes that HTTP was spoken behind the
- # proxy.
- proxy_set_header X-Forwarded-Proto $scheme;
-
- # Pass on the actual HTTP_HOST ("Host:" header) so that Rails can build proper absolute URLs
- proxy_set_header Host $host:$server_port;
-
- gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
- gzip_proxied any;
-
- location / {
- proxy_pass http://127.0.0.1:3000/;
- }
- }
-}
diff --git a/public/images/raty/cancel-off.png.xmp b/public/images/raty/cancel-off.png.xmp
new file mode 100644
index 0000000..5163a5a
--- /dev/null
+++ b/public/images/raty/cancel-off.png.xmp
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+ Christoph Haas
+
+
+
+
+ All rights reserved
+
+
+
+
+ bad-bodenteich
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bad-bodenteich
+
+
+
+
+
diff --git a/public/images/raty/cancel-on.png.xmp b/public/images/raty/cancel-on.png.xmp
new file mode 100644
index 0000000..111ac16
--- /dev/null
+++ b/public/images/raty/cancel-on.png.xmp
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+ Christoph Haas
+
+
+
+
+ All rights reserved
+
+
+
+
+ bad-bodenteich
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bad-bodenteich
+
+
+
+
+
diff --git a/public/images/sso/amazon.png.xmp b/public/images/sso/amazon.png.xmp
new file mode 100644
index 0000000..27195ae
--- /dev/null
+++ b/public/images/sso/amazon.png.xmp
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+ Christoph Haas
+
+
+
+
+ All rights reserved
+
+
+
+
+ bad-bodenteich
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bad-bodenteich
+
+
+
+
+
diff --git a/vendor/assets/images/jquery-fancybox/blank.gif.xmp b/vendor/assets/images/jquery-fancybox/blank.gif.xmp
new file mode 100644
index 0000000..42946e8
--- /dev/null
+++ b/vendor/assets/images/jquery-fancybox/blank.gif.xmp
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+