Fixes
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
*.db
|
*.db
|
||||||
tmp.*
|
tmp.*
|
||||||
*.log
|
*.log
|
||||||
|
.env
|
||||||
|
@@ -16,6 +16,15 @@ Style/TrailingCommaInArrayLiteral:
|
|||||||
Style/FrozenStringLiteralComment:
|
Style/FrozenStringLiteralComment:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
|
Style/GlobalVars:
|
||||||
|
Enabled: false
|
||||||
|
|
||||||
|
Style/MutableConstant:
|
||||||
|
Enabled: false
|
||||||
|
|
||||||
|
Style/StringLiteralsInInterpolation:
|
||||||
|
Enabled: false
|
||||||
|
|
||||||
Layout/SpaceAroundOperators:
|
Layout/SpaceAroundOperators:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
|
4
Gemfile
4
Gemfile
@@ -11,3 +11,7 @@ gem "json"
|
|||||||
gem "base64"
|
gem "base64"
|
||||||
|
|
||||||
gem "zlib"
|
gem "zlib"
|
||||||
|
|
||||||
|
gem "uri"
|
||||||
|
|
||||||
|
gem "net-http"
|
||||||
|
10
Gemfile.lock
10
Gemfile.lock
@@ -3,9 +3,12 @@ GEM
|
|||||||
specs:
|
specs:
|
||||||
base64 (0.3.0)
|
base64 (0.3.0)
|
||||||
bigdecimal (3.2.2)
|
bigdecimal (3.2.2)
|
||||||
|
json (2.12.2)
|
||||||
logger (1.7.0)
|
logger (1.7.0)
|
||||||
mustermann (3.0.3)
|
mustermann (3.0.3)
|
||||||
ruby2_keywords (~> 0.0.1)
|
ruby2_keywords (~> 0.0.1)
|
||||||
|
net-http (0.6.0)
|
||||||
|
uri
|
||||||
rack (3.1.16)
|
rack (3.1.16)
|
||||||
rack-protection (4.1.1)
|
rack-protection (4.1.1)
|
||||||
base64 (>= 0.1.0)
|
base64 (>= 0.1.0)
|
||||||
@@ -25,16 +28,23 @@ GEM
|
|||||||
rack-session (>= 2.0.0, < 3)
|
rack-session (>= 2.0.0, < 3)
|
||||||
tilt (~> 2.0)
|
tilt (~> 2.0)
|
||||||
tilt (2.6.0)
|
tilt (2.6.0)
|
||||||
|
uri (1.0.3)
|
||||||
xxhash (0.6.0)
|
xxhash (0.6.0)
|
||||||
|
zlib (3.2.1)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
x86_64-linux
|
x86_64-linux
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
|
base64
|
||||||
|
json
|
||||||
|
net-http
|
||||||
sequel
|
sequel
|
||||||
sinatra
|
sinatra
|
||||||
|
uri
|
||||||
xxhash
|
xxhash
|
||||||
|
zlib
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.6.9
|
2.6.9
|
||||||
|
57
index.html
57
index.html
@@ -1,16 +1,69 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>Infinsweeper</title>
|
<title>InfinSweeper</title>
|
||||||
<link rel="icon" type="image/png" href="src/assets/img/logo_sm.png" />
|
<link rel="icon" type="image/png" href="src/assets/img/logo_sm.png" />
|
||||||
<meta
|
<meta
|
||||||
name="viewport"
|
name="viewport"
|
||||||
content="initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"
|
content="initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"
|
||||||
/>
|
/>
|
||||||
<link rel="stylesheet" href="src/assets/style.css" />
|
<link rel="stylesheet" href="src/assets/style.css" />
|
||||||
|
<script type="module" src="src/js/accounts.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
<div class="header">
|
||||||
|
<a href="/">
|
||||||
|
<img
|
||||||
|
src="src/assets/img/logo_lg.png"
|
||||||
|
alt="InfinSweeper"
|
||||||
|
class="logo pixelart"
|
||||||
|
/>
|
||||||
|
</a>
|
||||||
|
<div class="header-right">
|
||||||
|
<button class="account-button" id="login-button">LOGIN</button>
|
||||||
|
<button class="account-button" id="signup-button">SIGN UP</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<canvas id="main-canvas"></canvas>
|
<canvas id="main-canvas"></canvas>
|
||||||
<script type="module" src="src/js/index.js"></script>
|
<script type="module" src="src/js/game.js"></script>
|
||||||
|
<div class="popup">
|
||||||
|
<div class="popup-tab" id="login">
|
||||||
|
<span class="info" id="login-info"></span>
|
||||||
|
<form id="login-form" class="form">
|
||||||
|
<input type="text" name="username" placeholder="Username" required />
|
||||||
|
<input type="password" name="pass" placeholder="Password" required />
|
||||||
|
<button type="submit">Login</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="popup-tab" id="signup">
|
||||||
|
<form id="signup-form" class="form">
|
||||||
|
<span class="info" id="signup-info"></span>
|
||||||
|
<input type="text" name="username" placeholder="Username" required />
|
||||||
|
<input type="email" name="email" placeholder="Email" required />
|
||||||
|
<input type="password" name="pass" placeholder="Password" required />
|
||||||
|
<button type="submit">Sign Up</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="popup-tab" id="forgot-pass">
|
||||||
|
<span class="info" id="forgot-info"></span>
|
||||||
|
<form id="forgot-form" class="form">
|
||||||
|
<input type="email" name="email" placeholder="Email" />
|
||||||
|
<button type="submit">Submit</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="popup-tab" id="reset-pass">
|
||||||
|
<span class="info" id="reset-info"></span>
|
||||||
|
<form id="reset-form" class="form">
|
||||||
|
<input type="password" name="pass" placeholder="Password" required />
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
name="pass_confirm"
|
||||||
|
placeholder="Confirm Password"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
<button type="submit">Submit</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
10
logman.rb
Normal file
10
logman.rb
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
# module for logging
|
||||||
|
module Logman
|
||||||
|
def self.log(log)
|
||||||
|
File.write("log/main.log", "[#{Time.now}] #{log}\n", mode: "a")
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.imp(log)
|
||||||
|
File.write("log/imp.log", "[#{Time.now}] #{log}\n", mode: "a")
|
||||||
|
end
|
||||||
|
end
|
31
mailer.rb
Normal file
31
mailer.rb
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
# Mailer module
|
||||||
|
module Mail
|
||||||
|
def send(to, subject, body)
|
||||||
|
from_email = "noreply@infinsweeper.syedm.dev"
|
||||||
|
from_name = "InfinSweeper"
|
||||||
|
to = Array(to).map { |addr| { email_address: { address: addr, name: "" } } }
|
||||||
|
|
||||||
|
payload = {
|
||||||
|
from: {
|
||||||
|
address: from_email,
|
||||||
|
name: from_name,
|
||||||
|
},
|
||||||
|
to: to,
|
||||||
|
subject: subject,
|
||||||
|
htmlbody: body,
|
||||||
|
}
|
||||||
|
|
||||||
|
uri = URI("https://api.zeptomail.com/v1.1/email")
|
||||||
|
req = Net::HTTP::Post.new(uri)
|
||||||
|
req["Authorization"] = "Zoho-enczapikey #{ENV_HASH["ZOHO_PASS"]}"
|
||||||
|
req["Content-Type"] = "application/json"
|
||||||
|
req.body = payload.to_json
|
||||||
|
|
||||||
|
http = Net::HTTP.new(uri.host, uri.port)
|
||||||
|
http.use_ssl = true
|
||||||
|
response = http.request(req)
|
||||||
|
|
||||||
|
return if response.is_a?(Net::HTTPSuccess)
|
||||||
|
Logman.imp "[ZeptoMail ERROR] #{response.body}"
|
||||||
|
end
|
||||||
|
end
|
145
main.rb
145
main.rb
@@ -1,123 +1,93 @@
|
|||||||
require "sinatra"
|
require "sinatra"
|
||||||
require "json"
|
require "json"
|
||||||
|
require "base64"
|
||||||
require_relative "players"
|
require "zlib"
|
||||||
require_relative "session"
|
require "sequel"
|
||||||
|
require "xxhash"
|
||||||
|
require "net/http"
|
||||||
|
require "uri"
|
||||||
|
|
||||||
ALPHANUM = [*"0".."9", *"A".."Z", *"a".."z", "-", "_"].freeze
|
ALPHANUM = [*"0".."9", *"A".."Z", *"a".."z", "-", "_"].freeze
|
||||||
|
|
||||||
|
env_data = File.read(".env")
|
||||||
|
ENV_HASH = {}
|
||||||
|
|
||||||
|
env_data.each_line do |line|
|
||||||
|
if (match = line.match(/^([A-Z_][A-Z0-9_]*)=(.*)$/))
|
||||||
|
_, key, val = match
|
||||||
|
ENV_HASH[key] = val
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
CODE_ENV = :dev
|
||||||
|
|
||||||
db_file = File.expand_path("infinsweeper.db")
|
db_file = File.expand_path("infinsweeper.db")
|
||||||
DB = Sequel.connect("sqlite:///#{db_file}", single_threaded: false)
|
DB = Sequel.connect("sqlite:///#{db_file}", single_threaded: false)
|
||||||
DB.run("PRAGMA foreign_keys = ON;")
|
DB.run("PRAGMA foreign_keys = ON;")
|
||||||
|
$active_users = DB[:SignedInUsers].all.map { |x| [x[:code], x[:player]] }.to_h
|
||||||
|
|
||||||
signed_in_users = DB[:SignedInUsers].all.map { |x| [x[:code], x[:player]] }.to_h
|
load "logman.rb"
|
||||||
|
load "mailer.rb"
|
||||||
Thread.new do
|
load "players.rb"
|
||||||
loop do
|
load "session.rb"
|
||||||
now = Time.now
|
|
||||||
fifteen_days_ago = now - (60 * 60 * 24 * 15)
|
|
||||||
six_days_ago = now - (60 * 60 * 24 * 6)
|
|
||||||
old_sessions = (DB[:SignedInUsers].where { created_at < fifteen_days_ago }.all +
|
|
||||||
DB[:SignedInUsers].where { last_used_at < six_days_ago }.all).uniq { |s| s[:code] }
|
|
||||||
old_sessions.each do |session|
|
|
||||||
begin
|
|
||||||
DB[:SignedInUsers].where(code: session[:code]).delete
|
|
||||||
rescue StandardError => e
|
|
||||||
File.write("log/main.log",
|
|
||||||
"[#{Time.now}] Thread DB error: #{e.message} on #{session[:code]} for #{session[:player]}\n",
|
|
||||||
mode: "a")
|
|
||||||
end
|
|
||||||
signed_in_users.delete(session[:code])
|
|
||||||
puts "Auto-logged out: #{session[:player]} (expired session)"
|
|
||||||
end
|
|
||||||
rescue StandardError => e
|
|
||||||
File.write("log/main.log", "[#{Time.now}] Thread error: #{e.message}\n", mode: "a")
|
|
||||||
ensure
|
|
||||||
sleep 60 * 60 * 24
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
set :public_folder, "public"
|
set :public_folder, "public"
|
||||||
|
|
||||||
get "/" do
|
get "/" do
|
||||||
|
session = Sessions.new request, response
|
||||||
|
Logman.log session["message"]
|
||||||
send_file "index.html"
|
send_file "index.html"
|
||||||
end
|
end
|
||||||
|
|
||||||
get "/debug" do
|
get "/debug" do
|
||||||
return get_session_all(request, response).inspect
|
content_type :json
|
||||||
|
(Sessions.new request, response).all.to_json
|
||||||
end
|
end
|
||||||
|
|
||||||
post "/new_player" do
|
post "/signup" do
|
||||||
|
session = Sessions.new request, response
|
||||||
data = JSON.parse(request.body.read)
|
data = JSON.parse(request.body.read)
|
||||||
if data["email"].nil? || data["pass"].nil? || data["username"].nil?
|
if data["email"].nil? || data["pass"].nil? || data["username"].nil?
|
||||||
status 400
|
status 400
|
||||||
return { "message" => "Bad request made!" }.to_json
|
return { "message" => "Bad request made!" }.to_json
|
||||||
end
|
end
|
||||||
player = Players.mk_player(data["username"], data["email"], data["pass"])
|
signup_status = Players.mk_player(data["username"], data["email"], data["pass"])
|
||||||
case player
|
if signup_status[0] == 200
|
||||||
when "Successfully registered!"
|
login_status = session.login(data["username"], data["pass"])
|
||||||
code = Array.new(24) { ALPHANUM.sample }.join
|
status login_status[0]
|
||||||
set_session(request, response, "user", code, code)
|
return { "message" => login_status[1] }.to_json
|
||||||
signed_in_users[code] = data["email"]
|
|
||||||
begin
|
|
||||||
DB["insert into SignedInUsers (code, player) values (?, ?)", code, data["email"]].insert
|
|
||||||
rescue Sequel::Error => e
|
|
||||||
File.write("log/main.log", "DB Error: #{e.message}\n", mode: "a")
|
|
||||||
status 500
|
|
||||||
return { "message" => "Internal server error when signing you in!" }.to_json
|
|
||||||
end
|
|
||||||
status 200
|
|
||||||
else
|
|
||||||
status 400
|
|
||||||
end
|
end
|
||||||
return { "message" => player }.to_json
|
status signup_status[0]
|
||||||
|
return { "message" => signup_status[1] }.to_json
|
||||||
end
|
end
|
||||||
|
|
||||||
get "/verify/:code" do
|
get "/verify/:code" do
|
||||||
if Players.verify(params[:code])
|
session = Sessions.new request, response
|
||||||
status 200
|
session["message"] = Players.verify(params[:code]) ? "Verified successfully!" : "Verification failed!"
|
||||||
return { "message" => "Verified successfully!" }.to_json
|
redirect "/"
|
||||||
else
|
|
||||||
status 400
|
|
||||||
return { "message" => "Couldn't verify!" }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
post "/login" do
|
post "/login" do
|
||||||
data = JSON.parse(request.body.read)
|
data = JSON.parse(request.body.read)
|
||||||
player = Players.authorized?(data["email"], data["pass"])
|
session = Sessions.new request, response
|
||||||
if player
|
uid = session["user"]
|
||||||
code = Array.new(24) { ALPHANUM.sample }.join
|
if $active_users[uid] && !session.logout(uid)
|
||||||
set_session(request, response, "user", code, code)
|
status 500
|
||||||
signed_in_users[code] = data["email"]
|
return { "message" => "Internal server error when signing the existing session out!" }.to_json
|
||||||
begin
|
|
||||||
DB["insert into SignedInUsers (code, player) values (?, ?)", code, data["email"]].insert
|
|
||||||
rescue Sequel::Error => e
|
|
||||||
File.write("log/main.log", "DB Error: #{e.message}\n", mode: "a")
|
|
||||||
status 500
|
|
||||||
return { "message" => "Internal server error when signing you in!" }.to_json
|
|
||||||
end
|
|
||||||
status 200
|
|
||||||
return { "message" => "Remember to verify your email!" }.to_json unless Players.verified?(data["email"])
|
|
||||||
return { "message" => "Signed in successfully!" }.to_json
|
|
||||||
else
|
|
||||||
status 400
|
|
||||||
return { "message" => "Couldn't sign you in!" }.to_json
|
|
||||||
end
|
end
|
||||||
|
login_status = session.login(data["username"], data["pass"])
|
||||||
|
status login_status[0]
|
||||||
|
return { "message" => login_status[1] }.to_json
|
||||||
end
|
end
|
||||||
|
|
||||||
post "/logout" do
|
post "/logout" do
|
||||||
uid = get_session(request, response, "user")
|
session = Sessions.new request, response
|
||||||
if signed_in_users[uid].nil?
|
uid = session["user"]
|
||||||
|
if $active_users[uid].nil?
|
||||||
status 400
|
status 400
|
||||||
return { "message" => "Not signed in!" }.to_json
|
return { "message" => "Not signed in!" }.to_json
|
||||||
end
|
end
|
||||||
signed_in_users.delete(uid)
|
unless session.logout(uid)
|
||||||
rm_session(request, response, "user")
|
|
||||||
begin
|
|
||||||
DB["delete from SignedInUsers where code = ?", uid].delete
|
|
||||||
rescue Sequel::Error => e
|
|
||||||
File.write("log/main.log", "DB Error: #{e.message}\n", mode: "a")
|
|
||||||
status 500
|
status 500
|
||||||
return { "message" => "Internal server error when signing you out!" }.to_json
|
return { "message" => "Internal server error when signing you out!" }.to_json
|
||||||
end
|
end
|
||||||
@@ -136,6 +106,10 @@ post "/forgot_password" do
|
|||||||
return { "message" => "Email sent successfully!" }.to_json
|
return { "message" => "Email sent successfully!" }.to_json
|
||||||
end
|
end
|
||||||
|
|
||||||
|
get "/reset_password/:code" do
|
||||||
|
redirect "/?reset_code=#{params[:code]}"
|
||||||
|
end
|
||||||
|
|
||||||
post "/reset_password/:code" do
|
post "/reset_password/:code" do
|
||||||
data = JSON.parse(request.body.read)
|
data = JSON.parse(request.body.read)
|
||||||
if data["pass"].nil? || params[:code].nil?
|
if data["pass"].nil? || params[:code].nil?
|
||||||
@@ -152,14 +126,13 @@ post "/reset_password/:code" do
|
|||||||
end
|
end
|
||||||
|
|
||||||
delete "/rm_player" do
|
delete "/rm_player" do
|
||||||
uid = get_session(request, response, "user")
|
session = Sessions.new request, response
|
||||||
if uid.nil? || signed_in_users[uid].nil?
|
uid = session["user"]
|
||||||
|
if uid.nil? || $active_users[uid].nil?
|
||||||
status 400
|
status 400
|
||||||
return { "message" => "Not signed in!" }.to_json
|
return { "message" => "Not signed in!" }.to_json
|
||||||
end
|
end
|
||||||
if Players.rm_player(signed_in_users[uid])
|
if session.logout(uid) && Players.rm_player($active_users[uid])
|
||||||
signed_in_users.delete(uid)
|
|
||||||
rm_session(request, response, "user")
|
|
||||||
status 200
|
status 200
|
||||||
return { "message" => "Sorry to see you go.." }.to_json
|
return { "message" => "Sorry to see you go.." }.to_json
|
||||||
else
|
else
|
||||||
|
56
players.rb
56
players.rb
@@ -1,21 +1,11 @@
|
|||||||
require "xxhash"
|
|
||||||
require "sequel"
|
|
||||||
require "json"
|
|
||||||
|
|
||||||
ALPHANUM = [*"0".."9", *"A".."Z", *"a".."z", "-", "_"].freeze
|
|
||||||
|
|
||||||
# DataBase handler module
|
# DataBase handler module
|
||||||
module Players
|
module Players
|
||||||
db_file = File.expand_path("infinsweeper.db")
|
|
||||||
DB = Sequel.connect("sqlite:///#{db_file}", single_threaded: false)
|
|
||||||
DB.run("PRAGMA foreign_keys = ON;")
|
|
||||||
|
|
||||||
def self.list
|
def self.list
|
||||||
DB["select * from Players"].all
|
DB["select * from Players"].all
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.rm_player(email)
|
def self.rm_player(username)
|
||||||
DB["delete from Players where email = ?", email].delete != 0
|
DB["delete from Players where username = ?", username].delete != 0
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.mk_player(username, email, pass)
|
def self.mk_player(username, email, pass)
|
||||||
@@ -26,25 +16,24 @@ module Players
|
|||||||
pass.match?(/\A[a-zA-Z0-9_.!?@#$%^&*()+=-]+\z/) && pass.length >= 8
|
pass.match?(/\A[a-zA-Z0-9_.!?@#$%^&*()+=-]+\z/) && pass.length >= 8
|
||||||
|
|
||||||
digest = XXhash.xxh32(pass, 1234)
|
digest = XXhash.xxh32(pass, 1234)
|
||||||
|
code = CODE_ENV == :prod ? Array.new(24) { ALPHANUM.sample }.join : "!"
|
||||||
code = Array.new(24) { ALPHANUM.sample }.join
|
|
||||||
|
|
||||||
DB[
|
DB[
|
||||||
"insert into Players (email, digest, username, activation_code) values (?, ?, ?, ?)",
|
"insert into Players (username, digest, email, activation_code) values (?, ?, ?, ?)",
|
||||||
email, digest, username, code
|
username, digest, email, code
|
||||||
].insert
|
].insert
|
||||||
|
|
||||||
send_email(:new, email, username, code)
|
send_email(:new, email, username, code) if CODE_ENV == :prod
|
||||||
|
|
||||||
"Successfully registered!"
|
[200, "Successfully signed up!"]
|
||||||
rescue ArgumentError => e
|
rescue ArgumentError => e
|
||||||
e.message
|
[400, e.message]
|
||||||
rescue Sequel::UniqueConstraintViolation
|
rescue Sequel::UniqueConstraintViolation
|
||||||
"Account already exists with this email or username!"
|
[400, "Account already exists with this username or username!"]
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.verify(code)
|
def self.verify(code)
|
||||||
DB["update Players set activation_code = ? where code = ?", "!", code].update != 0
|
DB["update Players set activation_code = ? where activation_code = ?", "!", code].update != 0
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.unverified
|
def self.unverified
|
||||||
@@ -62,35 +51,36 @@ module Players
|
|||||||
|
|
||||||
def self.pass_reset(new_pass, code)
|
def self.pass_reset(new_pass, code)
|
||||||
digest = XXhash.xxh32(new_pass, 1234)
|
digest = XXhash.xxh32(new_pass, 1234)
|
||||||
DB["update Players set digest = ? where new_pass_code = ?", digest, code].update != 0
|
DB["update Players set digest = ?, new_pass_code = ? where new_pass_code = ?", digest, "", code].update != 0
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.[](email)
|
def self.[](username)
|
||||||
DB["select * from Players where email = ?", email].first
|
DB["select * from Players where username = ?", username].first
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.[]=(email, data)
|
def self.[]=(username, data)
|
||||||
DB["update Players set data = ? where email = ?", data, email].update
|
DB["update Players set data = ? where username = ?", data, username].update
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.authorized?(email, pass)
|
def self.authorized?(username, pass)
|
||||||
digest = XXhash.xxh32(pass, 1234)
|
digest = XXhash.xxh32(pass, 1234)
|
||||||
player = self[email]
|
player = self[username]
|
||||||
player && player[:digest].to_i == digest.to_i ? player : false
|
player && player[:digest].to_i == digest.to_i ? player : false
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.verified?(email)
|
def self.verified?(username)
|
||||||
player = self[email]
|
player = self[username]
|
||||||
player && player[:code] == "!"
|
Logger.log "Verified: #{player.inspect}\n"
|
||||||
|
player && player[:activation_code] == "!"
|
||||||
end
|
end
|
||||||
|
|
||||||
Thread.new do
|
Thread.new do
|
||||||
loop do
|
loop do
|
||||||
unverified.each do |player|
|
unverified.each do |player|
|
||||||
rm_player(player[:email]) if player[:created_at] + 24 * 60 * 60 < Time.now
|
rm_player(player[:username]) if player[:created_at] + 24 * 60 * 60 < Time.now
|
||||||
end
|
end
|
||||||
rescue StandardError => e
|
rescue StandardError => e
|
||||||
File.write("log/main.log", "Thread error: #{e.message}\n", mode: "a")
|
Logger.log "Thread error: #{e.message}\n"
|
||||||
ensure
|
ensure
|
||||||
sleep 60 * 60
|
sleep 60 * 60
|
||||||
end
|
end
|
||||||
|
BIN
public/src/assets/fonts/changa.woff
Normal file
BIN
public/src/assets/fonts/changa.woff
Normal file
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -2,3 +2,59 @@ body {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "Changa";
|
||||||
|
src: url("fonts/changa.woff") format("opentype");
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
width: 100%;
|
||||||
|
height: 90px;
|
||||||
|
background-color: #1b262c;
|
||||||
|
border-bottom: 3px solid #90bdd9;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
font-family: "Changa";
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo {
|
||||||
|
height: 50px;
|
||||||
|
position: relative;
|
||||||
|
top: 7px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup {
|
||||||
|
position: fixed;
|
||||||
|
top: 50%;
|
||||||
|
left: 50%;
|
||||||
|
transform: translate(-50%, -50%);
|
||||||
|
width: 500px;
|
||||||
|
height: 500px;
|
||||||
|
background-color: rgba(0, 0, 0, 0.5);
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
z-index: 9999;
|
||||||
|
}
|
||||||
|
|
||||||
|
.popup-tab {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-right {
|
||||||
|
margin-right: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pixelart {
|
||||||
|
image-rendering: pixelated;
|
||||||
|
image-rendering: crisp-edges;
|
||||||
|
margin: 0 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#main-canvas {
|
||||||
|
height: calc(100vh - 90px);
|
||||||
|
}
|
||||||
|
44
public/src/js/accounts.js
Normal file
44
public/src/js/accounts.js
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
const login_form = document.getElementById("login-form");
|
||||||
|
const login_button = document.getElementById("login-button");
|
||||||
|
|
||||||
|
login_button.onclick = () => {
|
||||||
|
document.getElementById("login").style.display = "block";
|
||||||
|
};
|
||||||
|
|
||||||
|
login_form.onsubmit = async (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
const username = login_form.username.value;
|
||||||
|
const pass = login_form.pass.value;
|
||||||
|
let response = await fetch("/login", {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ username, pass }),
|
||||||
|
});
|
||||||
|
response = await response.json();
|
||||||
|
document.getElementById("login-info").innerText = response.message;
|
||||||
|
};
|
||||||
|
|
||||||
|
const signup_form = document.getElementById("signup-form");
|
||||||
|
const signup_button = document.getElementById("signup-button");
|
||||||
|
|
||||||
|
signup_button.onclick = () => {
|
||||||
|
document.getElementById("signup").style.display = "block";
|
||||||
|
};
|
||||||
|
|
||||||
|
signup_form.onsubmit = async (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
const username = signup_form.username.value;
|
||||||
|
const email = signup_form.email.value;
|
||||||
|
const pass = signup_form.pass.value;
|
||||||
|
let response = await fetch("/signup", {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ username, email, pass }),
|
||||||
|
});
|
||||||
|
response = await response.json();
|
||||||
|
document.getElementById("signup-info").innerText = response.message;
|
||||||
|
};
|
@@ -39,7 +39,7 @@ export default class GameRenderer {
|
|||||||
/** @type {HTMLCanvasElement} */
|
/** @type {HTMLCanvasElement} */
|
||||||
this.canvas = document.getElementById(CANVAS_ID);
|
this.canvas = document.getElementById(CANVAS_ID);
|
||||||
this.canvas.width = window.innerWidth;
|
this.canvas.width = window.innerWidth;
|
||||||
this.canvas.height = window.innerHeight;
|
this.canvas.height = window.innerHeight - 90;
|
||||||
/** @type {CanvasRenderingContext2D} */
|
/** @type {CanvasRenderingContext2D} */
|
||||||
this.ctx = this.canvas.getContext("2d");
|
this.ctx = this.canvas.getContext("2d");
|
||||||
this.ctx.imageSmoothingEnabled = false;
|
this.ctx.imageSmoothingEnabled = false;
|
||||||
|
@@ -83,7 +83,7 @@ export default class UIRenderer extends GameRenderer {
|
|||||||
*/
|
*/
|
||||||
resize() {
|
resize() {
|
||||||
this.canvas.width = window.innerWidth;
|
this.canvas.width = window.innerWidth;
|
||||||
this.canvas.height = window.innerHeight;
|
this.canvas.height = window.innerHeight - 90;
|
||||||
this.ctx.imageSmoothingEnabled = false;
|
this.ctx.imageSmoothingEnabled = false;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
CREATE TABLE IF NOT EXISTS Players (
|
CREATE TABLE IF NOT EXISTS Players (
|
||||||
email TEXT PRIMARY KEY,
|
username TEXT PRIMARY KEY,
|
||||||
username TEXT UNIQUE,
|
email TEXT UNIQUE,
|
||||||
digest BLOB,
|
digest BLOB,
|
||||||
data BLOB,
|
data BLOB,
|
||||||
activation_code TEXT,
|
activation_code TEXT,
|
||||||
@@ -13,5 +13,5 @@ CREATE TABLE IF NOT EXISTS SignedInUsers (
|
|||||||
player TEXT,
|
player TEXT,
|
||||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||||
last_used_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
last_used_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||||
FOREIGN KEY (player) REFERENCES Players (email) ON DELETE CASCADE
|
FOREIGN KEY (player) REFERENCES Players (username) ON DELETE CASCADE
|
||||||
);
|
);
|
||||||
|
171
session.rb
171
session.rb
@@ -1,62 +1,121 @@
|
|||||||
require "base64"
|
# class Sessions
|
||||||
require "zlib"
|
class Sessions
|
||||||
require "json"
|
def initialize(request, response)
|
||||||
|
@request = request
|
||||||
def set_session(request, response, key, val, uid = nil)
|
@response = response
|
||||||
session = request.cookies["session"]
|
|
||||||
session = session.nil? ? "{}" : Zlib::Inflate.inflate(Base64.decode64(session))
|
|
||||||
session = JSON.parse(session)
|
|
||||||
session[key] = val
|
|
||||||
compressed = Zlib::Deflate.deflate(JSON.generate(session))
|
|
||||||
encoded = Base64.encode64(compressed)
|
|
||||||
response.set_cookie("session",
|
|
||||||
value: encoded,
|
|
||||||
path: "/",
|
|
||||||
expires: Time.now + 360 * 24 * 60 * 60)
|
|
||||||
begin
|
|
||||||
DB["UPDATE SignedInUsers SET last_used_at = CURRENT_TIMESTAMP WHERE code = ?", uid].update if uid
|
|
||||||
rescue Sequel::Error => e
|
|
||||||
File.write("log/main.log", "DB Error: #{e.message} when updating last_used_at for #{uid}\n", mode: "a")
|
|
||||||
end
|
end
|
||||||
rescue JSON::ParserError, Zlib::Error
|
|
||||||
response.delete_cookie("session")
|
|
||||||
end
|
|
||||||
|
|
||||||
def get_session(request, response, key, uid = nil)
|
def signed_in?(code)
|
||||||
session = request.cookies["session"]
|
signed_in_users[code]
|
||||||
session = session.nil? ? "{}" : Zlib::Inflate.inflate(Base64.decode64(session))
|
|
||||||
session = JSON.parse(session)
|
|
||||||
begin
|
|
||||||
DB["UPDATE SignedInUsers SET last_used_at = CURRENT_TIMESTAMP WHERE code = ?", uid].update if uid
|
|
||||||
rescue Sequel::Error => e
|
|
||||||
File.write("log/main.log", "DB Error: #{e.message} when updating last_used_at for #{uid}\n", mode: "a")
|
|
||||||
end
|
end
|
||||||
session[key]
|
|
||||||
rescue JSON::ParserError, Zlib::Error
|
|
||||||
response.delete_cookie("session")
|
|
||||||
""
|
|
||||||
end
|
|
||||||
|
|
||||||
def get_session_all(request, response)
|
def logout(uid)
|
||||||
session = request.cookies["session"]
|
signed_in_users.delete(uid)
|
||||||
session = session.nil? ? "{}" : Zlib::Inflate.inflate(Base64.decode64(session))
|
delete("user")
|
||||||
JSON.parse(session)
|
DB["delete from SignedInUsers where code = ?", uid].delete
|
||||||
rescue JSON::ParserError, Zlib::Error
|
true
|
||||||
response.delete_cookie("session")
|
rescue Sequel::Error => e
|
||||||
""
|
Logger.log "DB Error: #{e.message}\n"
|
||||||
end
|
false
|
||||||
|
end
|
||||||
|
|
||||||
def rm_session(request, response, key)
|
def login(username, pass)
|
||||||
session = request.cookies["session"]
|
player = Players.authorized?(username, pass)
|
||||||
session = session.nil? ? "{}" : Zlib::Inflate.inflate(Base64.decode64(session))
|
if player
|
||||||
session = JSON.parse(session)
|
code = Array.new(24) { ALPHANUM.sample }.join
|
||||||
session.delete(key)
|
self["user", code] = code
|
||||||
compressed = Zlib::Deflate.deflate(JSON.generate(session))
|
signed_in_users[code] = username
|
||||||
encoded = Base64.encode64(compressed)
|
begin
|
||||||
response.set_cookie("session",
|
DB["insert into SignedInUsers (code, player) values (?, ?)", code, username].insert
|
||||||
value: encoded,
|
rescue Sequel::Error => e
|
||||||
path: "/",
|
Logger.log "DB Error: #{e.message}\n"
|
||||||
expires: Time.now + 360 * 24 * 60 * 60)
|
return [500, "Internal server error when signing you in!"]
|
||||||
rescue JSON::ParserError, Zlib::Error
|
end
|
||||||
response.delete_cookie("session")
|
return [200, "Remember to verify your email!"] unless Players.verified?(username)
|
||||||
|
[200, "Signed in successfully!"]
|
||||||
|
else
|
||||||
|
[200, "Couldn't sign you in (Username or password incorrect)!"]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def []=(key, uid, val)
|
||||||
|
session = @request.cookies["session"]
|
||||||
|
session = session.nil? ? "{}" : Zlib::Inflate.inflate(Base64.decode64(session))
|
||||||
|
session = JSON.parse(session)
|
||||||
|
session[key] = val
|
||||||
|
compressed = Zlib::Deflate.deflate(JSON.generate(session))
|
||||||
|
encoded = Base64.encode64(compressed)
|
||||||
|
@response.set_cookie("session",
|
||||||
|
value: encoded,
|
||||||
|
path: "/",
|
||||||
|
expires: Time.now + 360 * 24 * 60 * 60)
|
||||||
|
DB["UPDATE SignedInUsers SET last_used_at = CURRENT_TIMESTAMP WHERE code = ?", uid].update if uid
|
||||||
|
rescue JSON::ParserError, Zlib::Error
|
||||||
|
@response.delete_cookie("session")
|
||||||
|
rescue Sequel::Error => e
|
||||||
|
Logger.log "DB Error: #{e.message} when updating last_used_at for #{uid}\n"
|
||||||
|
end
|
||||||
|
|
||||||
|
def [](key, uid: nil)
|
||||||
|
session = @request.cookies["session"]
|
||||||
|
session = session.nil? ? "{}" : Zlib::Inflate.inflate(Base64.decode64(session))
|
||||||
|
session = JSON.parse(session)
|
||||||
|
begin
|
||||||
|
DB["UPDATE SignedInUsers SET last_used_at = CURRENT_TIMESTAMP WHERE code = ?", uid].update if uid
|
||||||
|
rescue Sequel::Error => e
|
||||||
|
Logger.log "DB Error: #{e.message} when updating last_used_at for #{uid}\n"
|
||||||
|
end
|
||||||
|
session[key]
|
||||||
|
rescue JSON::ParserError, Zlib::Error
|
||||||
|
@response.delete_cookie("session")
|
||||||
|
""
|
||||||
|
end
|
||||||
|
|
||||||
|
def all
|
||||||
|
session = @request.cookies["session"]
|
||||||
|
session = session.nil? ? "{}" : Zlib::Inflate.inflate(Base64.decode64(session))
|
||||||
|
JSON.parse(session)
|
||||||
|
rescue JSON::ParserError, Zlib::Error
|
||||||
|
@response.delete_cookie("session")
|
||||||
|
{}
|
||||||
|
end
|
||||||
|
|
||||||
|
def delete(key)
|
||||||
|
session = @request.cookies["session"]
|
||||||
|
session = session.nil? ? "{}" : Zlib::Inflate.inflate(Base64.decode64(session))
|
||||||
|
session = JSON.parse(session)
|
||||||
|
session.delete(key)
|
||||||
|
compressed = Zlib::Deflate.deflate(JSON.generate(session))
|
||||||
|
encoded = Base64.encode64(compressed)
|
||||||
|
@response.set_cookie("session",
|
||||||
|
value: encoded,
|
||||||
|
path: "/",
|
||||||
|
expires: Time.now + 360 * 24 * 60 * 60)
|
||||||
|
rescue JSON::ParserError, Zlib::Error
|
||||||
|
@response.delete_cookie("session")
|
||||||
|
end
|
||||||
|
|
||||||
|
Thread.new do
|
||||||
|
loop do
|
||||||
|
now = Time.now
|
||||||
|
fifteen_days_ago = now - (60 * 60 * 24 * 15)
|
||||||
|
six_days_ago = now - (60 * 60 * 24 * 6)
|
||||||
|
old_sessions = (DB[:SignedInUsers].where { created_at < fifteen_days_ago }.all +
|
||||||
|
DB[:SignedInUsers].where { last_used_at < six_days_ago }.all).uniq { |s| s[:code] }
|
||||||
|
old_sessions.each do |session|
|
||||||
|
begin
|
||||||
|
DB[:SignedInUsers].where(code: session[:code]).delete
|
||||||
|
rescue StandardError => e
|
||||||
|
Logger.log "Thread DB error: #{e.message} on #{session[:code]} for #{session[:player]}\n"
|
||||||
|
end
|
||||||
|
signed_in_users.delete(session[:code])
|
||||||
|
puts "Auto-logged out: #{session[:player]} (expired session)"
|
||||||
|
end
|
||||||
|
rescue StandardError => e
|
||||||
|
Logger.log "Thread error: #{e.message}\n"
|
||||||
|
ensure
|
||||||
|
sleep 60 * 60 * 24
|
||||||
|
Logger.log "Thread sleeping\n"
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user