diff --git a/Gemfile b/Gemfile index 8e167a091..75c3c048e 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,8 @@ gem 'active_interaction', '~> 3.8' gem 'apipie-rails', '~> 0.5.18' gem 'bootsnap', '>= 1.1.0', require: false gem 'iso8601', '0.12.1' # for dates and times -gem 'mimemagic', '~> 0.3.7' +gem 'mime-types-data' +gem 'mimemagic', '0.3.10' gem 'rails', '~> 6.0' gem 'rest-client' gem 'uglifier' diff --git a/Gemfile.lock b/Gemfile.lock index 04fe467c9..cc4238920 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,22 +54,13 @@ GIT GIT remote: https://github.com/internetee/omniauth-tara.git - revision: 75c369dd86a5fe1a2ee4c2a6246252d79431071c - branch: extended-logging + revision: cec845ec3794532144c4976104a07e206d759aa6 specs: omniauth-tara (0.3.0) addressable (~> 2.5) omniauth (~> 1.3) openid_connect (~> 1.1) -GIT - remote: https://github.com/karlerikounapuu/dnsruby.git - revision: f54986268ba3109ecf7a7af0d41a78cddfce9847 - branch: master - specs: - dnsruby (1.61.3) - simpleidn (~> 0.1) - GIT remote: https://github.com/tarmotalu/digidoc_client.git revision: 1645e83a5a548addce383f75703b0275c5310c32 @@ -85,60 +76,60 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.5) - actionpack (= 6.0.3.5) + actioncable (6.0.3.6) + actionpack (= 6.0.3.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.5) - actionpack (= 6.0.3.5) - activejob (= 6.0.3.5) - activerecord (= 6.0.3.5) - activestorage (= 6.0.3.5) - activesupport (= 6.0.3.5) + actionmailbox (6.0.3.6) + actionpack (= 6.0.3.6) + activejob (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) mail (>= 2.7.1) - actionmailer (6.0.3.5) - actionpack (= 6.0.3.5) - actionview (= 6.0.3.5) - activejob (= 6.0.3.5) + actionmailer (6.0.3.6) + actionpack (= 6.0.3.6) + actionview (= 6.0.3.6) + activejob (= 6.0.3.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.5) - actionview (= 6.0.3.5) - activesupport (= 6.0.3.5) + actionpack (6.0.3.6) + actionview (= 6.0.3.6) + activesupport (= 6.0.3.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.5) - actionpack (= 6.0.3.5) - activerecord (= 6.0.3.5) - activestorage (= 6.0.3.5) - activesupport (= 6.0.3.5) + actiontext (6.0.3.6) + actionpack (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) nokogiri (>= 1.8.5) - actionview (6.0.3.5) - activesupport (= 6.0.3.5) + actionview (6.0.3.6) + activesupport (= 6.0.3.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_interaction (3.8.3) activemodel (>= 4, < 7) - activejob (6.0.3.5) - activesupport (= 6.0.3.5) + activejob (6.0.3.6) + activesupport (= 6.0.3.6) globalid (>= 0.3.6) - activemodel (6.0.3.5) - activesupport (= 6.0.3.5) - activerecord (6.0.3.5) - activemodel (= 6.0.3.5) - activesupport (= 6.0.3.5) + activemodel (6.0.3.6) + activesupport (= 6.0.3.6) + activerecord (6.0.3.6) + activemodel (= 6.0.3.6) + activesupport (= 6.0.3.6) activerecord-import (1.0.8) activerecord (>= 3.2) - activestorage (6.0.3.5) - actionpack (= 6.0.3.5) - activejob (= 6.0.3.5) - activerecord (= 6.0.3.5) - marcel (~> 0.3.1) - activesupport (6.0.3.5) + activestorage (6.0.3.6) + actionpack (= 6.0.3.6) + activejob (= 6.0.3.6) + activerecord (= 6.0.3.6) + marcel (~> 1.0.0) + activesupport (6.0.3.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -224,6 +215,8 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) + dnsruby (1.61.5) + simpleidn (~> 0.1) docile (1.3.5) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -286,8 +279,7 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.0) method_source (0.8.2) mime-types (3.3.1) mime-types-data (~> 3.2015) @@ -295,7 +287,7 @@ GEM mimemagic (0.3.10) nokogiri (~> 1) rake - mini_mime (1.0.2) + mini_mime (1.0.3) mini_portile2 (2.4.0) minitest (5.14.4) monetize (1.9.4) @@ -361,29 +353,29 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.5) - actioncable (= 6.0.3.5) - actionmailbox (= 6.0.3.5) - actionmailer (= 6.0.3.5) - actionpack (= 6.0.3.5) - actiontext (= 6.0.3.5) - actionview (= 6.0.3.5) - activejob (= 6.0.3.5) - activemodel (= 6.0.3.5) - activerecord (= 6.0.3.5) - activestorage (= 6.0.3.5) - activesupport (= 6.0.3.5) + rails (6.0.3.6) + actioncable (= 6.0.3.6) + actionmailbox (= 6.0.3.6) + actionmailer (= 6.0.3.6) + actionpack (= 6.0.3.6) + actiontext (= 6.0.3.6) + actionview (= 6.0.3.6) + activejob (= 6.0.3.6) + activemodel (= 6.0.3.6) + activerecord (= 6.0.3.6) + activestorage (= 6.0.3.6) + activesupport (= 6.0.3.6) bundler (>= 1.3.0) - railties (= 6.0.3.5) + railties (= 6.0.3.6) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.3.5) - actionpack (= 6.0.3.5) - activesupport (= 6.0.3.5) + railties (6.0.3.6) + actionpack (= 6.0.3.6) + activesupport (= 6.0.3.6) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -530,7 +522,7 @@ DEPENDENCIES devise (~> 4.7) digidoc_client! directo! - dnsruby! + dnsruby (~> 1.61) domain_name e_invoice! epp! @@ -543,7 +535,8 @@ DEPENDENCIES jquery-ui-rails (= 5.0.5) kaminari lhv! - mimemagic (~> 0.3.7) + mime-types-data + mimemagic (= 0.3.10) minitest (~> 5.14) money-rails nokogiri (~> 1.10.0) diff --git a/db/structure.sql b/db/structure.sql index 242d28d58..a28f7fabd 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1988,6 +1988,40 @@ CREATE TABLE public.log_users ( uuid character varying ); +-- +-- Name: csync_records; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.csync_records ( + id bigint NOT NULL, + domain_id bigint NOT NULL, + cdnskey character varying NOT NULL, + action character varying NOT NULL, + times_scanned integer DEFAULT 0 NOT NULL, + last_scan timestamp without time zone NOT NULL, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: csync_records_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.csync_records_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: csync_records_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.csync_records_id_seq OWNED BY public.csync_records.id; + -- -- Name: log_users_id_seq; Type: SEQUENCE; Schema: public; Owner: - @@ -2251,15 +2285,12 @@ CREATE TABLE public.registrant_verifications ( action character varying NOT NULL, domain_id integer NOT NULL, action_type character varying NOT NULL, -<<<<<<< HEAD -======= creator_id integer, - updater_id integer + updater_id integer, session character varying, children json, ident_updated_at timestamp without time zone, - uuid character varying ->>>>>>> parent 64e3bc885a2cb8b46a1aaa4bf4f121ee7f5d44a6 + uuid character varying, creator_str character varying, updator_str character varying ); @@ -3026,18 +3057,6 @@ ALTER TABLE ONLY public.que_jobs ALTER COLUMN job_id SET DEFAULT nextval('public ALTER TABLE ONLY public.registrant_verifications ALTER COLUMN id SET DEFAULT nextval('public.registrant_verifications_id_seq'::regclass); --- --- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.users_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - -- -- Name: id; Type: DEFAULT; Schema: public; Owner: - -- @@ -3688,22 +3707,6 @@ ALTER TABLE ONLY public.log_invoice_items ADD CONSTRAINT log_invoice_items_pkey PRIMARY KEY (id); --- --- Name: log_invoices_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: --- - -ALTER TABLE ONLY public.log_invoices - ADD CONSTRAINT log_invoices_pkey PRIMARY KEY (id); - - --- --- Name: log_nameservers_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: --- - -ALTER TABLE ONLY public.log_nameservers - ADD CONSTRAINT log_nameservers_pkey PRIMARY KEY (id); - - -- -- Name: log_notifications_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -3720,14 +3723,6 @@ ALTER TABLE ONLY public.log_payment_orders ADD CONSTRAINT log_payment_orders_pkey PRIMARY KEY (id); --- --- Name: log_prices_pkey; Type: CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.log_prices - ADD CONSTRAINT log_prices_pkey PRIMARY KEY (id); - - -- -- Name: log_registrant_verifications_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -4325,6 +4320,17 @@ CREATE INDEX index_log_contacts_on_whodunnit ON public.log_contacts USING btree CREATE INDEX index_log_dnskeys_on_item_type_and_item_id ON public.log_dnskeys USING btree (item_type, item_id); +-- +-- Name: csync_records id; Type: DEFAULT; Schema: public; Owner: - +-- +ALTER TABLE ONLY public.csync_records ALTER COLUMN id SET DEFAULT nextval('public.csync_records_id_seq'::regclass); + +-- +-- Name: index_csync_records_on_domain_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE UNIQUE INDEX index_csync_records_on_domain_id ON public.csync_records USING btree (domain_id); + -- -- Name: index_log_dnskeys_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -4632,20 +4638,6 @@ CREATE UNIQUE INDEX unique_data_migrations ON public.data_migrations USING btree CREATE UNIQUE INDEX unique_schema_migrations ON public.schema_migrations USING btree (version); - --- --- Name: contacts_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: - --- - -CREATE UNIQUE INDEX unique_schema_migrations ON public.schema_migrations USING btree (version); - --- --- Name: contacts process_contact_audit; Type: TRIGGER; Schema: public; Owner: - --- - -CREATE TRIGGER process_contact_audit AFTER INSERT OR DELETE OR UPDATE ON public.contacts FOR EACH ROW EXECUTE PROCEDURE public.process_contact_audit(); - - -- -- Name: contacts contacts_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -4853,6 +4845,19 @@ ALTER TABLE ONLY public.nameservers ALTER TABLE ONLY public.users ADD CONSTRAINT user_registrar_id_fk FOREIGN KEY (registrar_id) REFERENCES public.registrars(id); +-- +-- Name: csync_records csync_records_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.csync_records + ADD CONSTRAINT csync_records_pkey PRIMARY KEY (id); + +-- +-- Name: csync_records fk_rails_5df85aeb13; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.csync_records + ADD CONSTRAINT fk_rails_5df85aeb13 FOREIGN KEY (domain_id) REFERENCES public.domains(id); -- -- PostgreSQL database dump complete