fluentd-ui 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3c6479d5aa2f739ecbd1d81551573c1a7ebd71f
-  data.tar.gz: c340dbf43abff0bd375ce4998d1fd87554085663
+  metadata.gz: 0d2d1064458092132d6bf08276249d5cad01fa53
+  data.tar.gz: 3bb9c625c6ca4de47099cacb840c373c52c7a644
 SHA512:
-  metadata.gz: 70d03f3e903070f6a83d7f085617baf1d21dbdc7c5c1a9ab6b764ae4aeb328a7ea4b98719e6d270215dc82e4a3e47cbd880e2f73d4ab7068b0af272f265aa9d3
-  data.tar.gz: 17967016b79c4941b41af0d99ade3286463ec43dbff9d2ad4f47c347bb8bca7e91db6d44cce0735571a595bead20f3d7ce566a49a6c524e9bf0a176a59af39ff
+  metadata.gz: 8f15c770ef0d50c63618650c3c29acab0c071e1570acf43d88eb2f93bfc0bbc92b296d1cfbe0d5c7da72d78cf6d55460d162d5027f409d37d71cd6a68babe5b7
+  data.tar.gz: f7588dedf26ee58a15caefe100f0f0640013f9844f8d00cd0a948885b1be562d0876102d013f57868dd937d8bfb4e2b777180439938f7a7c9ec35e45809a282e

data/ChangeLog

@@ -1,3 +1,10 @@
+Release 0.2.0 - 2014/09/02
+
+* [compatibility] Login password is reset as default if v0.1.x user who updates thier password.
+* [fixed] Keep changed password after update fluentd-ui gem.
+* [fixed] Add missing LICENSE file (Apache license 2.0)
+* [change] Remove bcrypt for packaging issue on Mac.
+
 Release 0.1.4 - 2014/08/20
 
 * [fixed] Fix can't setting in_tail with format regexp.

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.1.4)
+    fluentd-ui (0.2.0)
       addressable
-      bcrypt (~> 3.1.5)
       bundler
       fluentd (~> 0.10.51)
       font-awesome-rails
@@ -52,7 +51,6 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
-    bcrypt (3.1.7)
     builder (3.2.2)
     capybara (2.2.1)
       mime-types (>= 1.16)
@@ -145,7 +143,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (2.8.2)
+    puma (2.9.0)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)

data/LICENSE

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/app/controllers/application_controller.rb

@@ -16,8 +16,7 @@ class ApplicationController < ActionController::Base
 
   def current_user
     return unless session[:succeed_password]
-    # NOTE: if hashed password is invalid or broken, .authenticate would raise error. Using `try` is avoid that situation
-    @current_user ||= User.new(name: "admin").try(:authenticate, session[:succeed_password])
+    @current_user ||= User.new(name: "admin").authenticate(session[:succeed_password])
   end
 
   def login_required

data/app/models/fluentd.rb

@@ -46,13 +46,7 @@ class Fluentd
   end
 
   def self.json_path
-    if ENV["FLUENTD_UI_DATA_DIR"].present?
-      dir = ENV["FLUENTD_UI_DATA_DIR"]
-    else
-      dir = ENV["HOME"] + "/.fluentd-ui/core_data"
-    end
-    FileUtils.mkdir_p(dir)
-    dir + "/#{Rails.env}-fluentd.json"
+    FluentdUI.data_dir + "/#{Rails.env}-fluentd.json"
   end
 
   def fluentd?

data/app/models/user.rb

@@ -6,27 +6,36 @@
 
 class User
   include ActiveModel::Model
-  include ActiveModel::SecurePassword
 
-  has_secure_password
-
-  ENCRYPTED_PASSWORD_FILE = Rails.root + "db/#{Rails.env}-user.txt"
+  SALT = "XG16gfdC5IFRaQ3c".freeze
+  ENCRYPTED_PASSWORD_FILE = FluentdUI.data_dir + "/#{Rails.env}-user-pwhash.txt"
 
   attr_accessor :name, :password, :password_confirmation, :current_password
-  attr_writer :password_digest
 
   validates :name, presence: true
   validates :password, length: { minimum: 8 }
   validate :valid_current_password
+  validate :valid_password_confirmation
+
+  def authenticate(unencrypted_password)
+    digest(unencrypted_password) == stored_digest
+  end
 
-  def password_digest
-    @password_digest ||
-      begin
-        hash = File.read(ENCRYPTED_PASSWORD_FILE).rstrip
-        BCrypt::Password.new(hash) # raise BCrypt::Errors::InvalidHash if hash is invalid
-      rescue Errno::ENOENT, BCrypt::Errors::InvalidHash
-        BCrypt::Password.create(Settings.default_password, cost: cost)
-      end
+  def digest(unencrypted_password)
+    unencrypted_password ||= ""
+    hash = Digest::SHA1.hexdigest(SALT + unencrypted_password)
+    stretching_cost.times do
+      hash = Digest::SHA1.hexdigest(hash + SALT + unencrypted_password)
+    end
+    hash
+  end
+
+  def stored_digest
+    if File.exist?(ENCRYPTED_PASSWORD_FILE)
+      File.read(ENCRYPTED_PASSWORD_FILE).rstrip
+    else
+      digest(Settings.default_password)
+    end
   end
 
   def update_attributes(params)
@@ -36,17 +45,21 @@ class User
     return false unless valid?
 
     File.open(ENCRYPTED_PASSWORD_FILE, "w") do |f|
-      f.write BCrypt::Password.create(password, cost: cost)
+      f.write digest(password)
     end
   end
 
-  def cost
-    Rails.env.test? ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
-  end
-
   def valid_current_password
     unless authenticate(current_password)
       errors.add(:current_password, :wrong_password)
     end
   end
+
+  def valid_password_confirmation
+    password == password_confirmation
+  end
+
+  def stretching_cost
+    Rails.env.test? ? 1 : 20000
+  end
 end

data/fluentd-ui.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fluentd", "~> 0.10.51"
   spec.add_dependency 'rails', '4.1.4'
   spec.add_dependency 'sucker_punch', "~> 1.0.5"
-  spec.add_dependency 'bcrypt', '~> 3.1.5'
   spec.add_dependency 'addressable'
   spec.add_dependency "font-awesome-rails"
   spec.add_dependency 'sass-rails', '~> 4.0.3'

data/lib/fluentd-ui.rb

@@ -19,4 +19,10 @@ module FluentdUI
     return nil unless setup_fluentd
     setup_fluentd.agent.version
   end
+
+  def self.data_dir
+    dir = ENV["FLUENTD_UI_DATA_DIR"].presence || ENV["HOME"] + "/.fluentd-ui/core_data"
+    FileUtils.mkdir_p(dir) # ensure directory exists
+    dir
+  end
 end

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -53,20 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: bcrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +265,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Gemfile.production
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/images/.keep