config/initializers/delete_cache.rb
@@ -4,11 +4,13 @@ class BruteforceController < ApplicationController
# Start brute force
def index
+ session[:solved] = nil
render :action => 'pending' and return if solved? and !demo_mode
end
# Get client JavaScript for the HTML client
def client
+ session[:solved] = nil
render :action => 'pending.js' and return if solved? and !demo_mode
if demo_mode
@options = default_client_options 1
@@ -33,19 +35,20 @@ class BruteforceController < ApplicationController
# Hand in a response interval
def report
- render :text => 'Currently we don\'t keep track of reports. Thank you!' and return unless normal_mode
- render :text => 'Somebody already found the solution.', :status => 406 and return if solved? and !demo_mode
+ render :js => '// Currently we don\'t keep track of reports. Thank you!' and return unless normal_mode
+ render :js => "// Sorry, but the solution was already handed in by somebody else!\n// Let's refresh your browser (twice, to go sure ;).\nwindow.location.reload();\nwindow.location.reload();" and return if solved? and !demo_mode
Attack.save_report params[:client], params[:counter]
- render :text => 'Thank you for your report!'
+ render :js => '// Thank you for your report!'
end
# Hand in a solution
def solution
- if params[:password].to_s == session[:settings].secret
- if solved? and !demo_mode
+ if params[:password].to_s.hashed == session[:settings].sha
+ if solved? and !demo_mode and solved_by? != params[:client].to_s
render :action => 'alreadysolved' and return
else
- solve! params[:password].to_s unless demo_mode
+ session[:solved] = params[:password].to_s
+ solve!(params[:password].to_s, params[:client].to_s) unless demo_mode
render :action => 'congratulations' and return
end
end
@@ -60,8 +63,9 @@ class BruteforceController < ApplicationController
end
session[:updown] = 'DESC' unless session[:updown].to_s == 'ASC' or session[:updown].to_s == 'DESC'
@attacks = Attack.find(:all, :order => order + ' ' + session[:updown], :limit => 400)
- @progress = Attack.find(:all, :conditions => ["response"], :order => 'xoffset ASC', :limit => 400)
@realm = session[:settings].characters.size.to_i ** session[:settings].max.to_i
+ @solution = what_is_the_solution?
+ @client = solved_by?
render :layout => 'status'
end
@@ -88,7 +92,7 @@ class BruteforceController < ApplicationController
session[:settings] = session[:settings].save
flash[:notice] = 'Settings saved.'
else
- flash[:error] = 'Please provide a valid password according to the selected <b><u>valid characters</u></b> and <b><u>length</u></b>.'
+ flash[:error] = 'Please provide a valid password according to the <b><u>valid characters</u></b> and <b><u>length</u></b>.'
end
end
@realm = session[:settings].characters.size ** session[:settings].max
app/controllers/bruteforce_controller.rb
@@ -1,5 +1,22 @@
module ApplicationHelper
+ def solved_item(left=0, width=0, offset=0, password='')
+ return if left < 1 and width < 1
+ result = ''
+ result += '<div style="left:' + (left - 20).to_s + 'px; position:absolute; top:13px; color:red; font-size:13px; background-color:white; z-index:10000;">' + offset.to_delimiter_s + '</div>'
+ result += '<div style="left:' + left.to_s + 'px; width:' + width.to_s + 'px; position:absolute; top:31px; height:30px; background-color: red; z-index:10000;"></div>'
+ result += '<div style="left:' + (left - 20).to_s + 'px; position:absolute; top:63px; color:red; font-size:16px; background-color:white; z-index:10000;">' + password.to_s + '</div>'
+ end
+
+ def progress_item(left=0, width=0, offset=0)
+ return if left < 1 and width < 1
+ left = left + 31
+ width = width + 2
+ result = ''
+ result += '<div style="left:' + (left - 10).to_s + 'px; position:absolute; top:19px; font-size:9px; background-color:white;">' + offset.to_delimiter_s + '</div>' if left > 45 and left < 950
+ result += '<div style="left:' + left.to_s + 'px; width:' + width.to_s + 'px; position:absolute; top:31px; height:30px; background-color: yellow;"></div>'
+ end
+
def other_updown
session[:updown] == 'DESC' ? 'ASC' : 'DESC'
end
app/helpers/application_helper.rb
@@ -2,13 +2,14 @@ require 'yaml'
class Settings
- attr_accessor :secret, :mode, :max, :mix, :assumed, :character_space
+ attr_accessor :secret, :mode, :max, :mix, :assumed, :character_space, :sha
attr_reader :characters
def initialize
@mode = 'demo'
@character_space = 'alpha'
@secret = 'sha'
+ @sha = @secret.hashed
@max = 3
@assumed = 100000
@mix = 0
@@ -18,13 +19,14 @@ class Settings
# Loading settings from settings.yml
def read
settings = YAML.load_file SETTINGS_FILE
- [:secret, :mode, :max, :mix, :assumed, :character_space, :characters].each { |attribute| instance_eval "@#{attribute.to_s} = settings.#{attribute.to_s}" }
+ [:secret, :mode, :max, :mix, :assumed, :character_space, :characters, :sha].each { |attribute| instance_eval "@#{attribute.to_s} = settings.#{attribute.to_s}" }
self
end
# Save settings object to file
def save
@characters = characters_array @mix
+ @sha = @secret.size == 64 ? @secret : @secret.hashed
File.open(SETTINGS_FILE, 'w') { |file| file.write YAML::dump(self) }
self
end
@@ -41,21 +43,22 @@ class Settings
def character_space_short
case @character_space
- when 'alpha' then 'a-z'
- when 'alnum' then 'A-Z a-z 0-9'
- when 'digit' then '0-9'
- when 'ascii' then 'A-Z a-z 0-9 ' + SPECIAL_CHARS.join(' ')
+ when 'alpha' then HUMAN_ALPHA
+ when 'alnum' then HUMAN_ALNUM
+ when 'digit' then HUMAN_DIGIT
+ when 'ascii' then HUMAN_ASCII
end
end
def valid_secret?
+ return true if @secret.size == 64 # Hashes are allowed as input value
return false if @secret.empty? or @secret.size != @max
case @character_space
- when 'alpha' then !(@secret =~ /[^a-zA-Z]/)
- when 'alnum' then !(@secret =~ /[^a-zA-Z0-9]/)
- when 'digit' then !(@secret =~ /[^0-9]/)
- when 'ascii' then !(@secret =~ Regexp.new('[^a-zA-Z0-9' + Regexp.escape(SPECIAL_CHARS.join) + ']'))
- end
+ when 'alpha' then !(@secret =~ REG_ALPHA)
+ when 'alnum' then !(@secret =~ REG_ALNUM)
+ when 'digit' then !(@secret =~ REG_DIGIT)
+ when 'ascii' then !(@secret =~ REG_ASCII)
+ end
end
# Reset Settings and save to file
app/models/settings.rb
@@ -1,6 +1,6 @@
<h1 id="title">Congratulations!!!</h1>
-You found the password! It's <div id="solution"><h2><%= session[:settings].secret %></h2></div>
+You found the password! It's <div id="solution"><%= session[:settings].secret %></div>
Thank you for participating in our project.
app/views/bruteforce/congratulations.html.erb
@@ -1,10 +1,14 @@
<h1>s h a c k e r</h1>
-<span id="setup">Connecting to server... </span><span id="status_label"></span><span id="status"></span>
+<span id="setup"><%= button_to_function "Load s h a c k e r >", "window.location.reload()", :id => "override_button" %></span><span id="status_label"></span><span id="status"> <%= button_to_function "Start s h a c k e r >", "start_shacker()", :id => "start_button" %></span>
+
+<%= javascript_tag update_page { |page|
+ page['override_button'].hide
+ page['setup'].update 'Connecting to server... '
+}%>
<%= javascript_tag remote_function(
- :url => {:action => 'client.js', :only_path => false },
+ :url => {:action => 'client.js', :randomizer => random_string, :only_path => false },
404 => "$('setup').insert('#{escape_javascript "HTTP Error 404.".to_error}')",
:failure => "$('setup').insert('#{escape_javascript "failure.<br/><br/>".to_error}Reason: HTTP Error' + request.status)",
:success => "$('setup').insert('#{escape_javascript "success.<br/>".to_success}')"
)%>
-
app/views/bruteforce/index.html.erb
@@ -7,10 +7,12 @@
Currently there are no challenges.<br>
Please hang on, until one comes up.
</h2>
- (This page reloads automatically, just wait right here :)<br><br>
+ <span id="autoreloader">(This page reloads automatically, just wait right here :)<br><br><%= button_to_function "Look for a challenge now!", 'window.location.reload()' %></span>
+ <br><br>
</div>
<%= javascript_tag update_page { |page|
+ #page['autoreloader'].update '(This page reloads automatically, just wait right here :)'
page['container'].visual_effect(:highlight)
page['busy'].appear
page.delay(20) do
app/views/bruteforce/pending.html.erb
@@ -5,7 +5,7 @@
<% f.inputs do %>
<%= f.input :mode, :as => :select, :collection => MODES, :include_blank => false, :hint => 'This influences the scalability of our application on the server\'s side.', :required => false %>
<%= f.input :character_space, :label => 'Chars', :as => :select, :collection => CHARACTER_SPACES, :include_blank => false, :hint => 'Which characters do we allow for the password?', :required => false %>
- <%= f.input :secret, :hint => "The password to be cracked. Currently allowed characters: <br/><tt>#{session[:settings].character_space_short}</tt>", :required => false %>
+ <%= f.input :secret, :hint => "The password to be cracked. Currently allowed characters: <br/><tt>#{session[:settings].character_space_short}</tt> (<b>OR</b> a SHA-256 hash value) #{"<br/>Now: <tt>#{session[:settings].sha}</tt>" if session[:settings].secret != session[:settings].sha}", :required => false %>
<%= f.input :max, :label => 'Length', :as => :select, :collection => Settings.maxes, :include_blank => false, :hint => "The number of characters in the password that we will specifically assume. <br/>Current realm: #{number_with_delimiter @realm.to_i}", :required => false %>
<%= f.input :assumed, :label => 'Respond', :hint => "After how many tried password should the client send a response?<br/>The current password realm indicates that we need #{number_with_delimiter((@realm.to_i / session[:settings].assumed).to_positive_i)} clients.", :required => false %>
<%= f.input :mix, :as => :select, :collection => Settings.mixes, :include_blank => false, :hint => "Should we use a randomly sorted character space for brute force? This is the current order: <br/><tt>#{session[:settings].characters.to_a.join(' ')}</tt>" , :required => false %>
app/views/bruteforce/settings.html.erb
@@ -1,59 +1,77 @@
+<div id="barlabel">
+ <div style="float:left">1</div>
+ <div style="float:right"><%= @realm.to_delimiter_s %></div>
+</div>
+
+<div id="bar"></div>
+
<div id="statistics" style="clear:both">
+ <h1>Statistics</h1>
+
+ <% if @attacks.size > 0 %>
+
+ <div>
+ <div class="tcol attack id"><%= link_to 'ID', :sort => 'id', :updown => other_updown %></div>
+ <div class="tcol attack position"><%= link_to 'Pos.', :sort => 'position', :updown => other_updown %></div>
+ <div class="tcol attack offset"><%= link_to 'Offset', :sort => 'offset', :updown => other_updown %></div>
+ <div class="tcol attack chunk"><%= link_to 'Chunk', :sort => 'chunk', :updown => other_updown %></div>
+ <div class="tcol attack client"><%= link_to 'Client', :sort => 'client', :updown => other_updown %></div>
+ <div class="tcol attack created_at"><%= link_to 'Created', :sort => 'created_at', :updown => other_updown %></div>
+ <div class="tcol attack updated_at"><%= link_to 'Updated', :sort => 'updated_at', :updown => other_updown %></div>
+ <div class="tcol attack response"><%= link_to 'Response', :sort => 'response', :updown => other_updown %></div>
+ <div class="tcol attack timespan">Elapsed time</div>
+ <div class="tcol attack timespan"></div>
+ </div>
+
+ <% for attack in @attacks do %>
+
+ <% if attack.client == @client %>
+ <% solution_offset = attack.response.nil? ? attack.xoffset.overlap(@realm).to_s + ' + X ' : (attack.xoffset + attack.response).overlap(@realm) %>
+ <%= solved_item((((attack.xoffset.to_i + attack.response.to_i).overlap(@realm) * 1000) / @realm).to_i + 31, 5, solution_offset, @solution) %>
+ <% end %>
+
+ <% if attack.response and attack.response.to_i <= @realm %>
- <div id="barlabel">
- <div style="float:left">1</div>
- <div style="float:right"><%= @realm.to_delimiter_s %></div>
- </div>
- <div id="bar">
- <% if @progress.size > 0 %>
- <% total_progress = 0 %>
- <% for progress in @progress do %>
- <% left = ((progress.xoffset.to_i * 10) / @realm).to_i %>
- <% width = ((progress.response.to_i * 1000) / @realm).to_i %>
- <%= image_tag 'progress.gif', :style => "padding-left: #{left - total_progress}px; height: 27px; width: #{width}px; margin-left:40px;" %>
- <% total_progress += (left + width) %>
+ <%
+ left = ((attack.xoffset.to_i * 1000) / @realm).to_i
+ width = ((attack.response.to_i * 1000) / @realm).to_i
+ if (left + width) < 1001
+ first_width = width.overlap 1000
+ second_width = 0
+ else
+ first_width = (1000 - left)
+ second_width = (width - first_width).overlap 1000
+ end
+ %>
+
+ <%= progress_item left, first_width, attack.xoffset.to_i %>
+ <%= progress_item(1, second_width, attack.xoffset.to_i) unless second_width == 0 %>
+
<% end %>
- <% end %>
- </div>
-
-<br>
-<h1>Statistics</h1>
-
-<% if @attacks.size > 0 %>
-
- <div>
- <div class="tcol attack id"><%= link_to 'ID', :sort => 'id', :updown => other_updown %></div>
- <div class="tcol attack position"><%= link_to 'Pos.', :sort => 'position', :updown => other_updown %></div>
- <div class="tcol attack offset"><%= link_to 'Offset', :sort => 'offset', :updown => other_updown %></div>
- <div class="tcol attack chunk"><%= link_to 'Chunk', :sort => 'chunk', :updown => other_updown %></div>
- <div class="tcol attack client"><%= link_to 'Client', :sort => 'client', :updown => other_updown %></div>
- <div class="tcol attack created_at"><%= link_to 'Created', :sort => 'created_at', :updown => other_updown %></div>
- <div class="tcol attack updated_at"><%= link_to 'Updated', :sort => 'updated_at', :updown => other_updown %></div>
- <div class="tcol attack response"><%= link_to 'Response', :sort => 'response', :updown => other_updown %></div>
- <div class="tcol attack timespan">Elapsed time</div>
- </div>
-
- <% for attack in @attacks do %>
-
- <div id="<%= attack.id %>" style="clear:both;">
- <div class="attack id"><%= attack.id %></div>
- <div class="attack position"><%= attack.position %></div>
- <div class="attack offset"><%= attack.xoffset %></div>
- <div class="attack chunk"><tt><%= attack.chunk %></tt></div>
- <div class="attack client"><%= attack.client %></div>
- <div class="attack created_at"><%= attack.created_at.to_s(:db) %></div>
- <div class="attack updated_at"><%= attack.updated_at.to_s(:db) %></div>
- <div class="attack response"><%= attack.response %></div>
- <div class="attack timespan"><%= attack.timespan.to_s + 's' if attack.timespan > 0 %></div>
- </div>
+
+ <div id="<%= attack.id %>" style="clear:both;">
+ <div class="attack id <%= "solution" if attack.client == @client %>"><%= attack.id %></div>
+ <div class="attack position <%= "solution" if attack.client == @client %>"><%= attack.position %></div>
+ <div class="attack offset <%= "solution" if attack.client == @client %>"><%= attack.xoffset %></div>
+ <div class="attack chunk <%= "solution" if attack.client == @client %>"><tt><%= attack.chunk %></tt></div>
+ <div class="attack client <%= "solution" if attack.client == @client %>"><%= attack.client %></div>
+ <div class="attack created_at <%= "solution" if attack.client == @client %>"><%= attack.created_at.to_s(:db) %></div>
+ <div class="attack updated_at <%= "solution" if attack.client == @client %>"><%= attack.updated_at.to_s(:db) %></div>
+ <div class="attack response <%= "solution" if attack.client == @client %>"><%= attack.response %></div>
+ <div class="attack timespan <%= "solution" if attack.client == @client %>"><%= attack.timespan.to_s + 's' if attack.timespan > 0 %></div>
+ <% if attack.client == @client %>
+ <div class="attack timespan solution solutioninrow">
+ SOLUTION: <%= @solution %>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
<% end %>
-<% end %>
-<div style="clear:both"></div>
+ <div style="clear:both"></div>
<%= "<br>Note that only 400 entries are shown." if @attacks.size > 20 %>
</div>
-<%#= javascript_tag update_page { |page| page["statistics"].visual_effect(:highlight) } %>
-<%= javascript_tag update_page { |page| page.delay(10) { page.reload } } %>
\ No newline at end of file
+<%= javascript_tag update_page { |page| page.delay(10) { page.reload } } if unsolved? %>
app/views/bruteforce/statistics.html.erb
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" onclick='window.location.reload();'>
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<title>s h a c k e r</title>
app/views/layouts/status.html.erb
@@ -11,7 +11,7 @@ config.whiny_nils = true
# Show full error reports and disable caching
config.action_controller.consider_all_requests_local = true
config.action_view.debug_rjs = false
-config.action_controller.perform_caching = true
+config.action_controller.perform_caching = false
# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false
\ No newline at end of file
config/environments/development.rb
@@ -1,25 +1,43 @@
+# File paths
SETTINGS_FILE = File.join Rails.root, 'config', 'settings.yml'
SOLUTION_FILE = File.join Rails.root, 'tmp', 'solution.txt'
+CLIENT_FILE = File.join Rails.root, 'tmp', 'client.txt'
+# Characters
+ALPHA_DOWN = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z']
+ALPHA_CAP = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']
+ALPHA = ALPHA_DOWN + ALPHA_CAP
+SPECIAL_CHARS = ["!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ", ", "-", ".", "/", "="]
+DIGITS = ['0','1','2','3','4','5','6','7','8','9']
+
+# Character modes
CHARACTER_SPACES = [['Only alphabetical characters', 'alpha'],
['Alphabetical characters and numbers', 'alnum'],
['Only numbers', 'digit'],
['Numbers, alphabetical and special characters', 'ascii']]
+# Regexps for character modes
+REG_ALPHA = /[^a-zA-Z]/
+REG_ALNUM = /[^a-zA-Z0-9]/
+REG_DIGIT = /[^0-9]/
+REG_ASCII = Regexp.new('[^a-zA-Z0-9' + Regexp.escape(SPECIAL_CHARS.join) + ']')
+
+# Same thing only human-readable
+HUMAN_ALPHA = 'a-z A-Z'
+HUMAN_ALNUM = 'A-Z a-z 0-9'
+HUMAN_DIGIT = '0-9'
+HUMAN_ASCII = 'A-Z a-z 0-9 ' + SPECIAL_CHARS.join(' ')
+
+# Application modes
MODES = [['Normal mode', 'normal'],
['Demo mode (no solutions, no database)', 'demo'],
['Mass mode (no client response evaluation but highly scalable)', 'mass']]
-SPECIAL_CHARS = ["!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ", ", "-", ".", "/", "="]
-
-ALPHA_DOWN = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z']
-ALPHA_CAP = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z']
-ALPHA = ALPHA_DOWN + ALPHA_CAP
-
-DIGITS = ['0','1','2','3','4','5','6','7','8','9']
-
+# Javascript list for developers
JAVASCRIPTS = ['prototype', 'effects', 'lowpro', 'helper', 'sha256', 'algorithm']
+# Client modes
PRESETS = [['client', 'For our own HTML interface'], ['facebook', 'A low-duty version for Facebook profiles']]
-solve! # We don't want everything to begin unless via settings
\ No newline at end of file
+solve! # We do not want everything to begin unless via settings
+Attack.reset
config/initializers/settings.rb
@@ -3,7 +3,7 @@ ActionController::Routing::Routes.draw do |map|
map.connect 'facebook.js', :controller => 'bruteforce', :action => 'client', :option => 'facebook'
map.connect 'solution/:client', :controller => 'bruteforce', :action => 'solution'
- map.connect 'statistics/:sort/:updown', :controller => 'bruteforce', :action => 'status'
+ map.connect 'statistics/:sort/:updown', :controller => 'bruteforce', :action => 'statistics'
map.connect ':action', :controller => 'bruteforce'
map.connect ':action.:format', :controller => 'bruteforce'
config/routes.rb
@@ -1,5 +1,5 @@
--- !ruby/object:Settings
-assumed: 30000
+assumed: 100000
character_space: alpha
characters:
- a
@@ -56,5 +56,6 @@ characters:
- Z
max: 3
mix: 0
-mode: normal
-secret: baa
+mode: demo
+secret: sha
+sha: d600474b1b8e50d3633c91c0cf1efc454b79c9624a43fd7de441ee71745726ab
config/settings.yml
@@ -5,12 +5,22 @@ class Object
include ActionView::Helpers::NumberHelper
- def solve!(password='')
+ def solve!(password='', client='', offset='')
File.open(SOLUTION_FILE, 'w') { |f| f.write password.to_s }
+ File.open(CLIENT_FILE, 'w') { |f| f.write client.to_s }
end
def unsolve!
- File.delete SOLUTION_FILE if solved?
+ File.delete SOLUTION_FILE if File.exists? SOLUTION_FILE
+ File.delete CLIENT_FILE if File.exists? CLIENT_FILE
+ end
+
+ def what_is_the_solution?
+ File.new(SOLUTION_FILE).read if File.exists? SOLUTION_FILE
+ end
+
+ def solved_by?
+ File.new(CLIENT_FILE).read if File.exists? CLIENT_FILE
end
def solved?
lib/object.rb
@@ -4,7 +4,6 @@ counter = 0;
// You may want to override this if you are creating a widget.
function start_shacker() {
- console.log("Starting algorithm.");
shacker();
}
@@ -15,16 +14,13 @@ function shacker() {
if (secret == SHA256(chunk)) {
// Congratulations, you found it
- return solution(chunk);
-
+ solution(chunk);
} else {
-
// Nothing found yet, let's try the next password
if (chunk == last_chunk || chunk.length > length) {
// Start from the beginning, when ran out of password space
chunk = first_chunk;
- console.log('Starting at ' + chunk)
} else {
// Increment the chunk by one if we're somewhere in the middle
chunk = chunk.next_chunk();
@@ -44,7 +40,7 @@ function shacker() {
} else {
//console.log(chunk);
if (loop_delay > 0) {
- setTimeout(function() { shacker() }, loop_delay);
+ setTimeout(function() { shacker() }, loop_delay);
} else {
shacker();
}
@@ -54,18 +50,23 @@ function shacker() {
// Updating the <div id="status"></div>
function status() {
- if (!$('status')) return;
- $('status').update(": " + counter + " " + ((counter / realm) * 100).toPrecision(8) + "% " + init_chunk + "-" + chunk);
+ if ($('status')) $('status').update(": " + counter + " " + ((counter / realm) * 100).toPrecision(8) + "% " + init_chunk + "-" + chunk);
}
// Send interval report
function report(counter_to_report) {
- console.log('Reporting "' + counter_to_report + '"');
- new Ajax.Request(report_url.sub('COUNTERPLACEHOLDER', counter_to_report), {asynchronous:true});
+ new Ajax.Request(report_url.sub('COUNTERPLACEHOLDER', counter_to_report), {asynchronous:true, evalScripts:true});
}
// Redirect to solution page
function solution(password) {
- console.log('Handing in solution "' + password + '"');
- window.location.href = solution_url.sub('PASSWORDPLACEHOLDER', encodeURIComponent(String.interpret(password)));
+ url = solution_url.sub('PASSWORDPLACEHOLDER', encodeURIComponent(String.interpret(password)));
+ new Ajax.Request(url, {asynchronous:true});
+ $('status_label').update("");
+ $('status').update("");
+ // This rest of this function is a hack, in case the browser is really, really stupid.
+ $('setup').update("<h2>Congratulations!</h2>You found the password! It's <div id='solution'>" + password + "</div><a href='" + url + "'><h2>Please hand in the solution via THIS link.</h2></a>");
+ window.location.href = url;
+ window.location.href = url;
+ window.location.href = url;
}
public/javascripts/algorithm.js
@@ -21,17 +21,23 @@ div#solution {
color: red;
}
+div.solution {
+ font-weight: bold;
+ color: red;
+}
+
span#status { word-spacing:2em; }
div#busy { float:right; }
/* Admin */
div.cornerlink { float:right; padding: 10px 20px 0 0px; }
-div#barlabel { height: 15px; width:1000px; margin:0; }
-div#bar { clear:both; width:1000px; height:27px; border: 1px solid #ccc; padding:0; margin:;}
+div#barlabel { position:absolute; top:15px; left:30px; height: 15px; width:1002px; margin:0; }
+div#bar { position:absolute; top:30px; left:30px; width:1002px; height:30px; border: 1px solid #ccc; padding:0; }
+div#progress { position:absolute; top:30px; height:30px; background-color: yellow; }
input#reset_settings { color: red; }
-div#statistics { padding-top: 0; padding-left: 30px; margin:0; }
+div#statistics { padding-top: 50px; padding-left: 30px; margin:0; }
div.tcol { font-weight: bold; }
div.attacks { width: 900px; background-color: yellow;}
div.attack { float:left }
@@ -44,6 +50,7 @@ div.created_at { width: 140px; }
div.updated_at { width: 140px; }
div.response { font-weight: bold; width: 70px;}
div.timespan { font-weight: bold; }
+div.solutioninrow { padding-left: 30px; width: 140px; }
/* Flash messages */
public/stylesheets/application.css
@@ -15,3 +15,5 @@ form.formtastic fieldset ol li label { width:10% ; }
form.formtastic fieldset ol li p.inline-hints { margin-left: 10%; font-style:italic; color:#aaa; }
form.formtastic fieldset ol li.string input { width:20%; border-style: none; border: 1px solid #ccc; }
form.formtastic fieldset.buttons { padding-left:10%; }
+
+form.formtastic fieldset ol li.secret input { width:80%; border-style: none; border: 1px solid #ccc; }
public/stylesheets/formtastic_changes.css
public/javascripts/shacker.js
public/stylesheets/shacker.css
8ca9d4ee661d8d80d66e1e643e7ed9761256aa18
Commander Keen
nom@ximus.de
http://github.com/funkensturm/shacker/commit/a2cc9fa539970f75d7bf4fa24b436922fc15f0d0
a2cc9fa539970f75d7bf4fa24b436922fc15f0d0
2009-11-12T07:29:18-08:00
2009-11-12T07:29:18-08:00
firefox and statistic bug fixed
b8b6af0d32f15d14546092ee367dc57ab7ba559d
Commander Keen
nom@ximus.de