5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2025-02-23 15:51:50 +00:00

fix: no emitir certificados para subdominios directos

porque ya se hacen por wildcard
This commit is contained in:
f 2024-12-23 17:08:55 -03:00
parent e0e01a5445
commit a833eeb7eb
No known key found for this signature in database

View file

@ -6,6 +6,8 @@ module Api
class SitesController < BaseController class SitesController < BaseController
http_basic_authenticate_with name: ENV['HTTP_BASIC_USER'], http_basic_authenticate_with name: ENV['HTTP_BASIC_USER'],
password: ENV['HTTP_BASIC_PASSWORD'] password: ENV['HTTP_BASIC_PASSWORD']
SUBDOMAIN = ".#{Site.domain}"
PARTS = Site.domain.split('.').count
# Lista de nombres de dominios a emitir certificados # Lista de nombres de dominios a emitir certificados
def index def index
@ -24,13 +26,17 @@ module Api
name.end_with?('.') ? name[0..-2] : "#{name}.#{Site.domain}" name.end_with?('.') ? name[0..-2] : "#{name}.#{Site.domain}"
end end
# Es un subdominio directo del dominio principal
#
# @param name [String]
# @return [Bool]
def subdomain?(name) def subdomain?(name)
@@subdomain ||= ".#{Site.domain}" name.end_with?(SUBDOMAIN) && name.split('.').count == (PARTS + 1)
name.end_with? @subdomain
end end
# Dominios alternativos # Dominios alternativos
#
# @return [Array<String>]
def alternative_names def alternative_names
hostname_of(DeployAlternativeDomain.all).concat(hostname_of(DeployLocalizedDomain)).map do |name| hostname_of(DeployAlternativeDomain.all).concat(hostname_of(DeployLocalizedDomain)).map do |name|
canonicalize name canonicalize name
@ -41,6 +47,8 @@ module Api
# Obtener todos los sitios con API habilitada, es decir formulario # Obtener todos los sitios con API habilitada, es decir formulario
# de contacto y/o colaboración anónima. # de contacto y/o colaboración anónima.
#
# @return [Array<String>]
def api_names def api_names
Site.where(contact: true) Site.where(contact: true)
.or(Site.where(colaboracion_anonima: true)) .or(Site.where(colaboracion_anonima: true))