@@ -1,6 +1,7 @@ Originally by Simon Rozet (http://atonie.org/2008/02/git-wiki) Modified by: + - Jesse Newland (http://jnewland.com/) - http auth - Alex Payne (http://www.al3x.net) - Jesse Andrews (http://www.overstimulate.com) - Timoni Grone (http://www.timoni.org) - stylesheet and design aid AUTHORS @@ -2,10 +2,35 @@ h1. git-wiki A wiki engine that uses a Git repository as its data store. -h2. Status +h2. Getting Started -Alex Payne (see AUTHORS file) is no longer actively developing this branch. -Please fork from here and continue development! +@git submodule init@ + +@git submodule update@ + +h2. Running + +h3. Basics + +@ruby git-wiki.rb@ + +h3. Options + +h4. Run in production + +@ruby git-wiki.rb -e production@ + +h4. Run in production on port 8777 + +@ruby git-wiki.rb -e production -p 8080@ + +h4. HTTP Basic Auth + +@cp config.yml.sample config.yml@ + +@vim config.yml@ + +@CONFIG=config.yml ruby git-wiki.rb -e production -p 8080@ h2. Requirements README.textile @@ -1,8 +1,10 @@ +require 'fileutils' require 'rubygems' +require 'sinatra/lib/sinatra' require 'extensions' require 'page' -%w(git redcloth rubypants).each do |gem| +%w(git redcloth rubypants yaml).each do |gem| require_gem_with_feedback gem end @@ -14,4 +16,16 @@ unless File.exists?(GIT_REPO) && File.directory?(GIT_REPO) Git.init(GIT_REPO) end -$repo = Git.open(GIT_REPO) \ No newline at end of file +$repo = Git.open(GIT_REPO) + +config = nil +begin + config = YAML.load(File.read(ENV['CONFIG'])) +rescue + config = { + 'username' => nil, + 'password' => nil + } +end + +CONFIG = config \ No newline at end of file environment.rb @@ -22,3 +22,57 @@ class Time "#{(self.to_i * 1000)}" end end + +module HttpAuthentication + module Basic + + def authenticate_or_request_with_http_basic(realm = "Application", &login_procedure) + authenticate_with_http_basic(&login_procedure) || request_http_basic_authentication(realm) + end + + def authenticate_with_http_basic(&login_procedure) + authenticate(&login_procedure) + end + + def request_http_basic_authentication(realm = "Application") + authentication_request(realm) + end + + private + + def authenticate(&login_procedure) + if authorization + login_procedure.call(*user_name_and_password) + end + end + + def user_name_and_password + decode_credentials.split(/:/, 2) + end + + def authorization + request.env['HTTP_AUTHORIZATION'] || + request.env['X-HTTP_AUTHORIZATION'] || + request.env['X_HTTP_AUTHORIZATION'] || + request.env['REDIRECT_X_HTTP_AUTHORIZATION'] + end + + # Base64 + def decode_credentials + (authorization.split.last || '').unpack("m").first + end + + def authentication_request(realm) + status(401) + header("WWW-Authenticate" => %(Basic realm="#{realm.gsub(/"/, "")}")) + throw :halt, "HTTP Basic: Access denied.\n" + end + + end +end + +module Sinatra + class EventContext + include HttpAuthentication::Basic + end +end extensions.rb @@ -1,8 +1,14 @@ #!/usr/bin/env ruby -require 'fileutils' require 'environment' -require 'sinatra/lib/sinatra' + +before do + unless CONFIG['username'].nil? && CONFIG['password'].nil? + authenticate_or_request_with_http_basic "git-wiki" do + |user, pass| user == CONFIG['username'] && pass == CONFIG['password'] + end + end +end get('/') { redirect "/#{HOMEPAGE}" } git-wiki.rb @@ -22,7 +22,7 @@ </form> <%= yield %> <div id="footer"> - powered by <a href="http://github.com/sr/git-wiki/network">git-wiki</a> + powered by <a href="http://github.com/jnewland/git-wiki/network">git-wiki</a> </div> </div> </body> views/layout.erb README.markdown sinatra_http_auth.rb 384d75aabb3401a8787f343ca4fe6236887e6ecc Jesse Newland jnewland@gmail.com http://github.com/jnewland/git-wiki/commit/ecd24885479fcf956c5f6491f04177e98de115c2 ecd24885479fcf956c5f6491f04177e98de115c2 2008-05-14T20:10:10-07:00 2008-05-14T20:03:42-07:00 rework http auth to fit in with al3x's refactoring 231224fd3946a27577f11649f35b9ec51884680a Jesse Newland jnewland@gmail.com