RubyGems - himari - Versions diffs - 0.1.0 → 0.2.0 - Mend

himari 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9534716186569cef82a629dd4c15fdcc2f30b6b79712445ef67156b33c99a299
-  data.tar.gz: 8243f15a8bdf914c8b73447aab430a243b0dffea2ea2b84af032d92de3fcdc49
+  metadata.gz: 3ac0941b925171e38c0862b97f8a0ad2256c9ac56cfc3d3dd9b59bca1508dc4e
+  data.tar.gz: 37b2fc9399deca00071f07140c53aac84a8deb6169c9cb11f919d34388dae217
 SHA512:
-  metadata.gz: 30386ab57b39997a8634f63a99466f7efad64d0596767c8ad5f2123e877a1cd3b85f97f5ab29eb6a40d534a223582f56294220c5b3b9b5a873a5a61e928885d5
-  data.tar.gz: 207828253833d92b746ed271a8118e3389b9bbc51302ad57cf99bfb7dd339e337b27a770d6c63ebaa02e31c21264ca0b923fdee9ac3d28e5b55280cfd033aadf
+  metadata.gz: c0513156a600ffe7a0364ab2c7da45153702afce8c0fd82caf2c6f697529793570f61280abe50316ae5dd491c49908a084fe8d8341ef0a8882a4c5fee5eaf954
+  data.tar.gz: 5b63f0a995ebc2be40440d02831c2bbb40d8928277b3e181ffc0d227546274af0d6fee26f26f4cea9dd90578095b8023c9830973e5d39205273e4a1c7f2633d0

data/Rakefile CHANGED Viewed

@@ -5,4 +5,6 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
+Bundler::GemHelper.tag_prefix = "himari/"
 task default: :spec

data/lib/himari/app.rb CHANGED Viewed

@@ -1,5 +1,8 @@
 require 'sinatra/base'
 require 'addressable'
+require 'base64'
+require 'himari/version'
 require 'himari/log_line'
@@ -66,7 +69,16 @@ module Himari
       end
       def cachebuster
-        env['himari.cachebuster'] || "#{Process.pid}"
+        env['himari.cachebuster'] ||= Base64.urlsafe_encode64(release_code, padding: false)
+      end
+      def release_code
+        env['himari.release'] ||= begin
+          [
+            Himari::VERSION,
+            config.release_fragment,
+          ].compact.join(':')
+        end
       end
       def request_id
@@ -83,6 +95,12 @@ module Himari
           xff: env['HTTP_X_FORWARDED_FOR'],
         }
       end
+      def msg(key, default = nil)
+        config.custom_messages[key] || default
+      end
+      include ERB::Util
     end
     before do
@@ -119,7 +137,7 @@ module Himari
         ).call(env)
       else
         logger&.info(Himari::LogLine.new('authorize: prompt login', req: request_as_log, client_id: params[:client_id]))
-        erb :login
+        erb config.custom_templates[:login] || :login
       end
     rescue Himari::Services::DownstreamAuthorization::ForbiddenError => e
       logger&.warn(Himari::LogLine.new('authorize: downstream forbidden', req: request_as_log, allowed: e.result.authz_result.allowed, err: e.class.inspect, result: e.as_log))

data/lib/himari/config.rb CHANGED Viewed

@@ -5,7 +5,7 @@ require 'himari/log_line'
 module Himari
   class Config
-    def initialize(issuer:, storage:, providers: [], log_output: $stdout, log_level: Logger::INFO, preserve_rack_logger: false)
+    def initialize(issuer:, storage:, providers: [], log_output: $stdout, log_level: Logger::INFO, preserve_rack_logger: false, custom_templates: {}, custom_messages: {}, release_fragment: nil)
       @issuer = issuer
       @providers = providers
       @storage = storage
@@ -13,9 +13,13 @@ module Himari
       @log_output = log_output
       @log_level = log_level
       @preserve_rack_logger = preserve_rack_logger
+      @custom_messages = custom_messages
+      @custom_templates = custom_templates
+      @release_fragment = release_fragment
     end
-    attr_reader :issuer, :providers, :storage, :preserve_rack_logger
+    attr_reader :issuer, :providers, :storage, :preserve_rack_logger, :custom_messages, :custom_templates, :release_fragment
     def logger
       @logger ||= Logger.new(@log_output).tap do |l|

data/lib/himari/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Himari
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/public/public/index.css CHANGED Viewed

@@ -19,10 +19,10 @@ main {
   border: none;
 }
-main > header {
+main > header, main > footer {
   text-align: center;
 }
-main > header img{
+main > header img, main > footer img {
   max-width: 200px;
   height: auto;
 }

data/views/login.erb CHANGED Viewed

@@ -2,16 +2,22 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Himari Login</title>
-    <link rel="stylesheet" href="/public/index.css?v=<%= cachebuster %>" type="text/css" />
+    <title><%= h(msg(:page_title, nil) || msg(:title, "Login to Himari")) %></title>
+    <link rel="stylesheet" href="/public/index.css?cb=<%= cachebuster %>" type="text/css" />
     <meta name="viewport" content="initial-scale=1">
     <meta name="robots" content="noindex, nofollow">
-    <meta name="himari:release" content="TODO:">
+    <meta name="himari:release" content="<%= release_code %>">
   </head>
-  <body class='himari-app himari-loading'>
+  <body class='himari-app himari-login'>
     <main>
+      <header>
+        <h1><%= msg(:title, "Login to Himari") %></h1>
+        <%= msg(:header) %>
+      </header>
       <nav class='actions'>
         <fieldset id='actions-fieldset'>
           <% known_providers.each do |provider| %>
@@ -22,6 +28,10 @@
           <% end %>
         </fieldset>
       </nav>
+      <footer>
+        <%= msg(:footer) %>
+      </footer>
     </main>
     <script type='text/javascript'>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: himari
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sorah Fukumori
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -102,11 +102,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - Rakefile
-- himari.gemspec
 - lib/himari.rb
 - lib/himari/access_token.rb
 - lib/himari/app.rb
@@ -167,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Small OIDC IdP for small teams - Omniauth to OIDC

data/Gemfile DELETED Viewed

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-gem 'rake'
-group :test do
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'simplecov-html'
-  gem 'rack-test'
-end

data/Gemfile.lock DELETED Viewed

@@ -1,152 +0,0 @@
-PATH
-  remote: .
-  specs:
-    himari (0.1.0)
-      addressable
-      omniauth (>= 2.0)
-      openid_connect
-      rack-oauth2
-      rack-protection
-      sinatra (>= 3.0)
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    aes_key_wrap (1.1.0)
-    attr_required (1.0.1)
-    bindata (2.4.15)
-    concurrent-ruby (1.2.2)
-    date (3.3.3)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    faraday (2.7.4)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-follow_redirects (0.3.0)
-      faraday (>= 1, < 3)
-    faraday-net_http (3.0.2)
-    hashie (5.0.0)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    json-jwt (1.16.3)
-      activesupport (>= 4.2)
-      aes_key_wrap
-      bindata
-      faraday (~> 2.0)
-      faraday-follow_redirects
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    mini_mime (1.1.2)
-    minitest (5.18.0)
-    mustermann (3.0.0)
-      ruby2_keywords (~> 0.0.1)
-    net-imap (0.3.4)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.1)
-      timeout
-    net-smtp (0.3.3)
-      net-protocol
-    omniauth (2.1.1)
-      hashie (>= 3.4.6)
-      rack (>= 2.2.3)
-      rack-protection
-    openid_connect (2.2.0)
-      activemodel
-      attr_required (>= 1.0.0)
-      faraday (~> 2.0)
-      faraday-follow_redirects
-      json-jwt (>= 1.16)
-      net-smtp
-      rack-oauth2 (~> 2.2)
-      swd (~> 2.0)
-      tzinfo
-      validate_email
-      validate_url
-      webfinger (~> 2.0)
-    public_suffix (5.0.1)
-    rack (2.2.6.4)
-    rack-oauth2 (2.2.0)
-      activesupport
-      attr_required
-      faraday (~> 2.0)
-      faraday-follow_redirects
-      json-jwt (>= 1.11.0)
-      rack (>= 2.1.0)
-    rack-protection (3.0.5)
-      rack
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rake (13.0.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    ruby2_keywords (0.0.5)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    sinatra (3.0.5)
-      mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.5)
-      tilt (~> 2.0)
-    swd (2.0.2)
-      activesupport (>= 3)
-      attr_required (>= 0.0.5)
-      faraday (~> 2.0)
-      faraday-follow_redirects
-    tilt (2.1.0)
-    timeout (0.3.2)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    validate_email (0.1.6)
-      activemodel (>= 3.0)
-      mail (>= 2.2.5)
-    validate_url (1.0.15)
-      activemodel (>= 3.0.0)
-      public_suffix
-    webfinger (2.1.2)
-      activesupport
-      faraday (~> 2.0)
-      faraday-follow_redirects
-PLATFORMS
-  ruby
-DEPENDENCIES
-  himari!
-  rack-test
-  rake
-  rspec
-  simplecov
-  simplecov-html
-BUNDLED WITH
-   2.4.8

data/himari.gemspec DELETED Viewed

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-require_relative "lib/himari/version"
-Gem::Specification.new do |spec|
-  spec.name = "himari"
-  spec.version = Himari::VERSION
-  spec.authors = ["Sorah Fukumori"]
-  spec.email = ["her@sorah.jp"]
-  spec.summary = "Small OIDC IdP for small teams - Omniauth to OIDC"
-  spec.homepage = "https://github.com/sorah/himari"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/sorah/himari"
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.add_dependency "sinatra", '>= 3.0'
-  spec.add_dependency 'rack-protection'
-  spec.add_dependency "omniauth", ">= 2.0"
-  spec.add_dependency 'addressable'
-  spec.add_dependency "rack-oauth2"
-  spec.add_dependency "openid_connect"
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end