Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ jobs:
cp certs/saml2018.crt.example certs/saml2018.crt
cp keys/saml.key.enc.example keys/saml.key.enc
cp keys/saml2018.key.enc.example keys/saml2018.key.enc
bin/generate-example-keys
bundle exec rake db:setup --trace
bundle exec rake assets:precompile

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ Vagrantfile
/keys/*.key.enc
!/keys/*.key.enc.example
/keys/equifax_rsa
/keys/equifax_rsa.pub
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't want to ignore any of these, not just the one. When I run git status on your branch, this is what I see:

image

Everyone who's been working on this since before we stoped generating those on make setup will see the same thing. We'll want to leave these in so they don't accidentally get checked in by one of us.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

/keys/equifax_gpg.pub.bin
/keys/equifax_rsa.pub
/coverage
/db/*.sqlite3
/doc/search_stats.csv
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,5 @@ end

group :production do
gem 'aamva', git: 'git@github.com:18F/identity-aamva-api-client-gem', tag: 'v3.1.0'
gem 'equifax', git: 'git@github.com:18F/identity-equifax-api-client-gem.git', tag: 'v1.1.0'
gem 'lexisnexis', git: 'git@github.com:18F/identity-lexisnexis-api-client-gem', tag: 'v1.1.0'
end
15 changes: 0 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,6 @@ GIT
httpi
xmldsig

GIT
remote: git@github.com:18F/identity-equifax-api-client-gem.git
revision: de4258c7608997f72e119b16718eeead4d39db70
tag: v1.1.0
specs:
equifax (1.1.0)
activesupport
dotenv
gyoku
hashie
logger
savon

GIT
remote: git@github.com:18F/identity-lexisnexis-api-client-gem
revision: d17049ab1a03d50c0cc8a272d86cf2144192fab5
Expand Down Expand Up @@ -350,7 +337,6 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
logger (1.2.8)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
Expand Down Expand Up @@ -694,7 +680,6 @@ DEPENDENCIES
devise (~> 4.1)
dotiw
email_spec
equifax!
exception_notification
factory_bot_rails
fakefs
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ it into the "Index pattern" field, then click the "Next step" button.
10. On `Step 2 of 2: Configure settings`, select `@timestamp` from the
`Time Filter field name` dropdown, then click "Create index pattern".

11. Create some more events on the IdP app
11. Create some more events on the IdP app.

12. Refresh the Kibana website. You should now see new events show up in the
Discover section.
Expand Down
5 changes: 0 additions & 5 deletions app/services/request_key_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,4 @@ def self.read_key_file(key_file, passphrase)
key_file = Rails.root.join('keys', 'saml.key.enc')
read_key_file(key_file, Figaro.env.saml_passphrase)
end

cattr_accessor :equifax_ssh_key do
key_file = Rails.root.join('keys', 'equifax_rsa')
read_key_file(key_file, Figaro.env.equifax_ssh_passphrase)
end
end
46 changes: 0 additions & 46 deletions bin/generate-example-keys

This file was deleted.

1 change: 0 additions & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Dir.chdir APP_ROOT do

if ARGV.shift == "--docker" then
run 'docker-compose build'
run 'docker-compose run --rm web bin/generate-example-keys'
run 'docker-compose run --rm web yarn install'
run 'docker-compose run --rm web rake db:create'
run 'docker-compose run --rm web rake db:environment:set'
Expand Down
33 changes: 0 additions & 33 deletions config/application.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,6 @@ development:
enable_rate_limiting: 'false'
enable_test_routes: 'true'
enable_usps_verification: 'true'
equifax_avs_username: 'sekret'
equifax_development_example_gpg_passphrase: 'sekret'
equifax_eid_username: 'sekret'
equifax_endpoint: 'sekret'
equifax_gpg_email: 'logs@login.gov'
equifax_password: 'sekret'
equifax_phone_username: 'sekret'
equifax_sftp_directory: '/directory'
equifax_sftp_host: 'example.com'
equifax_sftp_username: 'user'
equifax_ssh_passphrase: 'sekret'
exception_recipients: 'test1@test.com'
hmac_fingerprinter_key: 'a2c813d4dca919340866ba58063e4072adc459b767a74cf2666d5c1eef3861db26708e7437abde1755eb24f4034386b0fea1850a1cb7e56bff8fae3cc6ade96c'
hmac_fingerprinter_key_queue: '["11111111111111111111111111111111", "22222222222222222222222222222222"]'
Expand Down Expand Up @@ -235,17 +224,6 @@ production:
enable_rate_limiting: 'true'
enable_test_routes: 'false'
enable_usps_verification: 'false'
equifax_avs_username:
equifax_development_example_gpg_passphrase:
equifax_eid_username:
equifax_endpoint:
equifax_gpg_email:
equifax_password:
equifax_phone_username:
equifax_sftp_directory: # '/directory'
equifax_sftp_host: # 'example.com'
equifax_sftp_username:
equifax_ssh_passphrase:
exception_recipients: 'user1@example.com,user2@example.com'
google_analytics_key: # 'UA-XXXXXXXXX-YY'
hmac_fingerprinter_key: # generate via `rake secret`
Expand Down Expand Up @@ -360,17 +338,6 @@ test:
enable_rate_limiting: 'true'
enable_test_routes: 'true'
enable_usps_verification: 'true'
equifax_avs_username: 'sekret'
equifax_development_example_gpg_passphrase: 'sekret'
equifax_eid_username: 'sekret'
equifax_endpoint: 'sekret'
equifax_gpg_email: 'logs@login.gov'
equifax_password: 'sekret'
equifax_phone_username: 'sekret'
equifax_sftp_directory: '/directory'
equifax_sftp_host: 'example.com'
equifax_sftp_username: 'user'
equifax_ssh_passphrase: 'sekret'
exception_recipients: 'test1@test.com'
hmac_fingerprinter_key: 'a2c813d4dca919340866ba58063e4072adc459b767a74cf2666d5c1eef3861db26708e7437abde1755eb24f4034386b0fea1850a1cb7e56bff8fae3cc6ade96c'
hmac_fingerprinter_key_queue: '["old-key-one", "old-key-two"]'
Expand Down
1 change: 0 additions & 1 deletion config/initializers/figaro.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
'enable_rate_limiting',
'enable_test_routes',
'enable_usps_verification',
'equifax_ssh_passphrase',
'exception_recipients',
'hmac_fingerprinter_key',
'issuers_with_email_nameid_format',
Expand Down
7 changes: 0 additions & 7 deletions config/initializers/proofer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,5 @@
end

Idv::Proofer.init

# Until equifax is removed, ensure env variables are available
[/^equifax_/].each do |pattern|
ENV.keys.grep(pattern).each do |env_var_name|
ENV[env_var_name.upcase] = ENV[env_var_name]
end
end
end
# rubocop:enable Metrics/LineLength
8 changes: 0 additions & 8 deletions spec/services/request_key_manager_spec.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
require 'rails_helper'

describe RequestKeyManager do
describe '.equifax_ssh_key' do
it 'initializes' do
ssh_key = described_class.equifax_ssh_key

expect(ssh_key).to be_a OpenSSL::PKey::RSA
end
end

describe '.private_key' do
it 'initializes' do
ssh_key = described_class.private_key
Expand Down