From 0975583e3c6ec9d2bf0269841073031537db1c37 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Jan 2013 11:08:05 +0100 Subject: we're not using a cert pool anymore - remove anything related --- certs/app/controllers/certs_controller.rb | 2 +- certs/app/models/client_certificate.rb | 24 +----------------------- 2 files changed, 2 insertions(+), 24 deletions(-) (limited to 'certs/app') diff --git a/certs/app/controllers/certs_controller.rb b/certs/app/controllers/certs_controller.rb index d81aea0..3ec2f68 100644 --- a/certs/app/controllers/certs_controller.rb +++ b/certs/app/controllers/certs_controller.rb @@ -4,7 +4,7 @@ class CertsController < ApplicationController # GET /cert def show - @cert = LeapCA::Cert.pick_from_pool + @cert = ClientCertificate.create render :text => @cert.key + @cert.cert, :content_type => 'text/plain' rescue RECORD_NOT_FOUND flash[:error] = t(:cert_pool_empty) diff --git a/certs/app/models/client_certificate.rb b/certs/app/models/client_certificate.rb index 0b1e43f..6abc1ee 100644 --- a/certs/app/models/client_certificate.rb +++ b/certs/app/models/client_certificate.rb @@ -18,34 +18,16 @@ class ClientCertificate < CouchRest::Model::Base property :key, String # the client private RSA key property :cert, String # the client x509 certificate, signed by the CA property :valid_until, Time # expiration time of the client certificate - property :random, Float, :accessible => false # used to help pick a random cert by the webapp - before_validation :generate, :set_random, :on => :create + before_validation :generate, :on => :create validates :key, :presence => true validates :cert, :presence => true - validates :random, :presence => true - validates :random, :numericality => {:greater_than => 0, :less_than => 1} design do - view :by_random end class << self - def sample - self.by_random.startkey(rand).first || self.by_random.first - end - - def pick_from_pool - cert = self.sample - raise RECORD_NOT_FOUND unless cert - cert.destroy - return cert - rescue RESOURCE_NOT_FOUND - retry if self.by_random.count > 0 - raise RECORD_NOT_FOUND - end - def valid_attributes_hash {:key => "ABCD", :cert => "A123"} end @@ -79,10 +61,6 @@ class ClientCertificate < CouchRest::Model::Base private - def set_random - self.random = rand - end - def self.root_ca @root_ca ||= begin crt = File.read(APP_CONFIG[:ca_cert_path]) -- cgit v1.2.3