zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-21 18:26:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

Put back password for pki login

Browse source
This commit is contained in:
Martin Lensment 2015-02-23 11:53:23 +02:00
parent fe67c51436
commit 00ecdba699
3 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/api/repp/api.rb
View file

@ -3,18 +3,8 @@ module Repp
format :json
prefix :repp
before do
auth_param = request.headers['Authorization'].split(' ', 2).second
username, password = ::Base64.decode64(auth_param || '').split(':', 2)
# allow user lookup only by username if request came from webclient
if request.ip == APP_CONFIG['webclient_ip'] && password.blank?
login_params = { username: username }
else
login_params = { username: username, password: password }
end
@current_user ||= ApiUser.find_by(login_params)
http_basic do |username, password|
@current_user ||= ApiUser.find_by(username: username, password: password)
end
helpers do

5
app/controllers/epp/sessions_controller.rb
View file

@ -9,10 +9,7 @@ class Epp::SessionsController < EppController
# rubocop: disable Metrics/CyclomaticComplexity
def login
cert_valid = true
# Allow login with only username
if request.ip == APP_CONFIG['webclient_ip'] && login_params[:password].nil?
@api_user = ApiUser.find_by(username: login_params[:username])
elsif request.ip == APP_CONFIG['webclient_ip']
if request.ip == APP_CONFIG['webclient_ip']
@api_user = ApiUser.find_by(login_params)
else
if request.env['HTTP_SSL_CLIENT_S_DN_CN'] != login_params[:username]