decidim-core 0.29.0.rc2 → 0.29.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58010f8c0acc3bb6a92e20dc385ac989fc98313060d5fbc3ef2c4d484af32720
-  data.tar.gz: 3be55fbdfae89e11566eb7ff9227133209de3e779fc2062cd6b86c6431436584
+  metadata.gz: 2d58ac45e047a62b04a7625b6da1c4ee92c2a62d9bf4e1969cdfb324257e5ef9
+  data.tar.gz: 94a06bf8519d6234945a39dc86cc9794149fa3dc09c89273dcd475a64a3ad78b
 SHA512:
-  metadata.gz: b57ad83f76d31c5938f46720f2370dbd08b10378f8acb9a302904574ec99b3af904e8cde5057451108a064cba47d26469fa71d39dabcb55c4e02c299751a62e8
-  data.tar.gz: d44e89eadae907601f933f342d6d6e25e97da2e44e806d5837d057f8c970597a0c69c61302ff9853b7ce43bb08d1ec3ab256620c414f66033a470c14843d02b4
+  metadata.gz: 6e90186e86e894822888b13cbaabe6c8c2a752d73a477cb13b39be5fd785d9b92082e5e403de91790f43c19a78f83bb85253e4fa0475f086f64e90258b2593b3
+  data.tar.gz: f297c4b6a5fad64c57984fc063778cddda2404f3861e75b8a16c4fff83986caedc44354bba11a58551c5815dae0c9785b5f8d159a9a7e0930d2f080341b69579

data/app/services/decidim/download_your_data_exporter.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "seven_zip_ruby"
-require "zip"
-require_relative "zip_stream/writer"
+require "decidim/seven_zip_wrapper"
 
 module Decidim
   # Public: Generates a 7z(seven zip) file with data files ready to be persisted
@@ -10,8 +8,6 @@ module Decidim
   #
   # In fact, the 7z file wraps a ZIP file which finally contains the data files.
   class DownloadYourDataExporter
-    include ::Decidim::ZipStream::Writer
-
     DEFAULT_EXPORT_FORMAT = "CSV"
     ZIP_FILE_NAME = "download-your-data.zip"
 
@@ -29,36 +25,25 @@ module Decidim
     end
 
     def export
-      dirname = File.dirname(@path)
-      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-      File.open(@path, "wb") do |file|
-        SevenZipRuby::Writer.open(file, password: @password) do |szw|
-          szw.header_encryption = true
-          szw.add_data(data, ZIP_FILE_NAME)
-        end
-      end
+      tmpdir = Dir.mktmpdir("temporary-download-your-data-dir")
+      user_data, user_attachments = data_and_attachments_for_user
+      save_user_data(tmpdir, user_data)
+      save_user_attachments(tmpdir, user_attachments)
+
+      SevenZipWrapper.compress_and_encrypt(filename: @path, password: @password, input_directory: tmpdir)
     end
 
     private
 
-    def data
-      buffer = Zip::OutputStream.write_buffer do |out|
-        user_data, attachments = data_for(@user, @export_format)
+    attr_reader :user, :export_format
 
-        add_user_data_to_zip_stream(out, user_data)
-        add_attachments_to_zip_stream(out, attachments)
-      end
-
-      buffer.string
-    end
-
-    def data_for(user, format)
+    def data_and_attachments_for_user
       export_data = []
       export_attachments = []
 
       download_your_data_entities.each do |object|
         klass = Object.const_get(object)
-        export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(format).new(klass.user_collection(user), klass.export_serializer).export]
+        export_data << [klass.model_name.name.parameterize.pluralize, Exporters.find_exporter(export_format).new(klass.user_collection(user), klass.export_serializer).export]
         attachments = klass.download_your_data_images(user)
         export_attachments << [klass.model_name.name.parameterize.pluralize, attachments.flatten] unless attachments.nil?
       end
@@ -69,5 +54,31 @@ module Decidim
     def download_your_data_entities
       @download_your_data_entities ||= DownloadYourDataSerializers.data_entities
     end
+
+    def save_user_data(tmpdir, user_data)
+      user_data.each do |entity, exporter_data|
+        next if exporter_data.read == "\n"
+
+        file_name = File.join(tmpdir, "#{entity}-#{exporter_data.filename}")
+        File.write(file_name, exporter_data.read)
+      end
+    end
+
+    def save_user_attachments(tmpdir, user_attachments)
+      user_attachments.each do |entity, attachment_block|
+        attachment_block.each do |attachment|
+          next unless attachment.attached?
+
+          blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
+          blobs.each do |blob|
+            Dir.mkdir(File.join(tmpdir, entity.parameterize))
+            file_name = File.join(tmpdir, entity.parameterize, blob.filename.to_s)
+            blob.open do |blob_file|
+              File.write(file_name, blob_file.read.force_encoding("UTF-8"))
+            end
+          end
+        end
+      end
+    end
   end
 end

data/decidim-core.gemspec

@@ -80,7 +80,6 @@ Gem::Specification.new do |s|
   s.add_dependency "request_store", "~> 1.5.0"
   s.add_dependency "rubyXL", "~> 3.4"
   s.add_dependency "rubyzip", "~> 2.0"
-  s.add_dependency "seven_zip_ruby", "~> 1.3"
   s.add_dependency "shakapacker", "~> 7.1.0"
   s.add_dependency "valid_email2", "~> 4.0"
   s.add_dependency "web-push", "~> 3.0"

data/lib/decidim/core/engine.rb

@@ -239,6 +239,14 @@ module Decidim
         app.config.action_mailer.deliver_later_queue_name = :mailers
       end
 
+      initializer "decidim_core.signed_global_id", after: "global_id" do |app|
+        next if app.config.global_id.fetch(:expires_in, nil).present?
+
+        config.after_initialize do
+          SignedGlobalID.expires_in = nil
+        end
+      end
+
       initializer "decidim_core.middleware" do |app|
         if app.config.public_file_server.enabled
           headers = app.config.public_file_server.headers || {}

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.29.0.rc2"
+      "0.29.0.rc3"
     end
   end
 end

data/lib/decidim/seven_zip_wrapper.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "shellwords"
+
+module Decidim
+  class SevenZipWrapper
+    class << self
+      def compress_and_encrypt(filename:, password:, input_directory:)
+        run("cd #{escape(input_directory)} && 7z a -tzip -p#{escape(password)} -mem=AES256 #{escape(filename)} .")
+      end
+
+      def extract_and_decrypt(filename:, password:, output_directory:)
+        run("7z x -tzip #{escape(filename)} -o#{escape(output_directory)} -p#{escape(password)}")
+      end
+
+      private
+
+      def run(command)
+        success = system(command)
+
+        raise "Command failed: #{command}" unless success
+      end
+
+      def escape(string)
+        Shellwords.escape(string)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.29.0.rc2
+  version: 0.29.0.rc3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -696,20 +696,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: seven_zip_ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: shakapacker
   requirement: !ruby/object:Gem::Requirement
@@ -772,28 +758,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0.rc2
+        version: 0.29.0.rc3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1907,7 +1893,6 @@ files:
 - app/services/decidim/static_map_generator.rb
 - app/services/decidim/tokenizer.rb
 - app/services/decidim/traceability.rb
-- app/services/decidim/zip_stream/writer.rb
 - app/uploaders/decidim/application_uploader.rb
 - app/uploaders/decidim/attachment_uploader.rb
 - app/uploaders/decidim/avatar_uploader.rb
@@ -2939,6 +2924,7 @@ files:
 - lib/decidim/searchable.rb
 - lib/decidim/seeds.rb
 - lib/decidim/settings_manifest.rb
+- lib/decidim/seven_zip_wrapper.rb
 - lib/decidim/shareable_with_token.rb
 - lib/decidim/snippets.rb
 - lib/decidim/social_share_service_manifest.rb

data/app/services/decidim/zip_stream/writer.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ZipStream
-    module Writer
-      def add_user_data_to_zip_stream(out, user_data)
-        user_data.each do |element|
-          filename_file = element.last.filename(element.first.parameterize)
-
-          out.put_next_entry(filename_file)
-          if element.last.read.presence
-            out.write element.last.read
-          else
-            out.write "No data"
-          end
-        end
-      end
-
-      def add_attachments_to_zip_stream(out, export_attachments)
-        export_attachments.each do |attachment_block|
-          next if attachment_block.last.nil?
-
-          folder_name = attachment_block.first.parameterize
-          attachment_block.last.each do |attachment|
-            next unless attachment.attached?
-
-            blobs = attachment.is_a?(ActiveStorage::Attached::One) ? [attachment.blob] : attachment.blobs
-            blobs.each do |blob|
-              out.put_next_entry("#{folder_name}/#{blob.filename}")
-              blob.open do |f|
-                out << f.read
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end