mirror of
https://github.com/ENSL/ensl.org.git
synced 2024-11-15 01:11:23 +00:00
Merge pull request #39 from cblanc/remove_ips
Remove IP data from plugin endpoint
This commit is contained in:
commit
ff48c80dbf
3 changed files with 90 additions and 52 deletions
|
@ -2,7 +2,6 @@ class PluginController < ApplicationController
|
|||
def user
|
||||
buffer = []
|
||||
out = []
|
||||
|
||||
if ban = Ban.first(:conditions => ["expiry > UTC_TIMESTAMP() AND steamid = ? AND ban_type = ?", params[:id], Ban::TYPE_SERVER])
|
||||
out << "#USER#"
|
||||
out << "BANNED"
|
||||
|
@ -31,7 +30,7 @@ class PluginController < ApplicationController
|
|||
|
||||
buffer << user.steamid
|
||||
buffer << user.username
|
||||
buffer << user.lastip
|
||||
buffer << '0.0.0.0'
|
||||
buffer << (user.team ? Verification.uncrap(user.team.to_s) : "No Team")
|
||||
buffer << user.id
|
||||
buffer << user.team_id
|
||||
|
|
29
spec/controllers/plugin/plugin_controller_spec.rb
Normal file
29
spec/controllers/plugin/plugin_controller_spec.rb
Normal file
|
@ -0,0 +1,29 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe PluginController do
|
||||
render_views
|
||||
|
||||
describe '#user' do
|
||||
before do
|
||||
create :group, :donors
|
||||
create :group, :champions
|
||||
end
|
||||
|
||||
let!(:user) { create :user_with_team }
|
||||
|
||||
it 'returns user data' do
|
||||
get :user, id: user.steamid
|
||||
expect(response).to be_success
|
||||
expect(response.body).to include(user.username)
|
||||
end
|
||||
|
||||
it 'definitely does not return IP address' do
|
||||
last_ip = '127.0.0.1'
|
||||
user.lastip = last_ip
|
||||
user.save!
|
||||
get :user, id: user.steamid
|
||||
expect(response).to be_success
|
||||
expect(response).to_not include(last_ip)
|
||||
end
|
||||
end
|
||||
end
|
|
@ -9,4 +9,14 @@ FactoryGirl.define do
|
|||
name "Admins"
|
||||
id Group::ADMINS
|
||||
end
|
||||
|
||||
trait :champions do
|
||||
name "Champions"
|
||||
id Group::CHAMPIONS
|
||||
end
|
||||
|
||||
trait :donors do
|
||||
name "Donors"
|
||||
id Group::DONORS
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue