diaspora_federation 0.0.3 → 0.0.4

data/lib/diaspora_federation/validators/person_validator.rb

@@ -0,0 +1,18 @@
+module DiasporaFederation
+  module Validators
+    # This validates a {Entities::Person}
+    class PersonValidator < Validation::Validator
+      include Validation
+
+      rule :guid, :guid
+
+      rule :diaspora_id, %i(not_empty diaspora_id)
+
+      rule :url, %i(not_nil nilableURI)
+
+      rule :profile, :not_nil
+
+      rule :exported_key, :public_key
+    end
+  end
+end

data/lib/diaspora_federation/validators/profile_validator.rb

@@ -0,0 +1,33 @@
+module DiasporaFederation
+  module Validators
+    # This validates a {Entities::Profile}
+    class ProfileValidator < Validation::Validator
+      include Validation
+
+      rule :diaspora_id, :diaspora_id
+
+      # the name must not contain a semicolon because of mentions
+      # @{<full_name> ; <diaspora_id>}
+      rule :first_name, regular_expression: {regex: /\A[^;]{,32}\z/}
+      rule :last_name, regular_expression: {regex: /\A[^;]{,32}\z/}
+
+      # this urls can be relative
+      rule :image_url, nilableURI: [:path]
+      rule :image_url_medium, nilableURI: [:path]
+      rule :image_url_small, nilableURI: [:path]
+
+      rule :birthday, :birthday
+
+      # TODO: replace regex with "length: {maximum: xxx}" but this rule doesn't allow nil now.
+      rule :gender, regular_expression: {regex: /\A.{,255}\z/}
+      rule :bio, regular_expression: {regex: /\A.{,65535}\z/}
+      rule :location, regular_expression: {regex: /\A.{,255}\z/}
+
+      rule :searchable, :boolean
+
+      rule :nsfw, :boolean
+
+      rule :tag_string, tag_count: {maximum: 5}
+    end
+  end
+end

data/lib/diaspora_federation/validators/rules/birthday.rb

@@ -0,0 +1,38 @@
+require "date"
+
+module Validation
+  module Rule
+    # Birthday validation rule
+    #
+    # Valid is:
+    # * nil or an empty +String+
+    # * a +Date+ object
+    # * a +String+ with the format "yyyy-mm-dd" and is a valid +Date+, example: 2015-07-25
+    class Birthday
+      # The error key for this rule
+      # @return [Symbol] error key
+      def error_key
+        :birthday
+      end
+
+      # Determines if value is a valid birthday date
+      def valid_value?(value)
+        return true if value.nil? || (value.is_a?(String) && value.empty?)
+        return true if value.is_a? Date
+
+        if value =~ /[0-9]{4}\-[0-9]{2}\-[0-9]{2}/
+          date_field = value.split("-").map(&:to_i)
+          return Date.valid_civil?(date_field[0], date_field[1], date_field[2])
+        end
+
+        false
+      end
+
+      # This rule has no params
+      # @return [Hash] params
+      def params
+        {}
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/rules/boolean.rb

@@ -0,0 +1,38 @@
+module Validation
+  module Rule
+    # Boolean validation rule
+    #
+    # Valid is:
+    # * a +String+: "true", "false", "t", "f", "yes", "no", "y", "n", "1", "0"
+    # * a +Fixnum+: 1 or 0
+    # * a +Boolean+: true or false
+    class Boolean
+      # The error key for this rule
+      # @return [Symbol] error key
+      def error_key
+        :boolean
+      end
+
+      # Determines if value is a valid +boolean+
+      def valid_value?(value)
+        return false if value.nil?
+
+        if value.is_a?(String)
+          true if value =~ /\A(true|false|t|f|yes|no|y|n|1|0)\z/i
+        elsif value.is_a?(Fixnum)
+          true if value == 1 || value == 0
+        elsif [true, false].include? value
+          true
+        else
+          false
+        end
+      end
+
+      # This rule has no params
+      # @return [Hash] params
+      def params
+        {}
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/rules/diaspora_id.rb

@@ -0,0 +1,46 @@
+module Validation
+  module Rule
+    # Diaspora ID validation rule
+    #
+    # This rule is based on https://github.com/zombor/Validator/blob/master/lib/validation/rule/email.rb
+    # which was adapted from https://github.com/emmanuel/aequitas/blob/master/lib/aequitas/rule/format/email_address.rb
+    class DiasporaId
+      # The Regex for a valid diaspora ID
+      DIASPORA_ID = begin
+        letter         = "a-zA-Z"
+        digit          = "0-9"
+        username       = "[#{letter}#{digit}\\-\\_\\.]+"
+        atext          = "[#{letter}#{digit}+\\=\\-\\_]"
+        dot_atom       = "#{atext}+([.]#{atext}*)*"
+        no_ws_ctl      = '\x01-\x08\x11\x12\x14-\x1f\x7f'
+        text           = '[\x01-\x09\x11\x12\x14-\x7f]'
+        quoted_pair    = "(\\x5c#{text})"
+        dtext          = "[#{no_ws_ctl}\\x21-\\x5a\\x5e-\\x7e]"
+        dcontent       = "(?:#{dtext}|#{quoted_pair})"
+        domain_literal = "\\[#{dcontent}+\\]"
+        domain         = "(?:#{dot_atom}|#{domain_literal})"
+        port           = "(:[#{digit}]+)?"
+        addr_spec      = "(#{username}\\@#{domain}#{port})?"
+
+        /\A#{addr_spec}\z/u
+      end
+
+      # The error key for this rule
+      # @return [Symbol] error key
+      def error_key
+        :diaspora_id
+      end
+
+      # Determines if value is a valid diaspora ID
+      def valid_value?(value)
+        value.nil? || !DIASPORA_ID.match(value).nil?
+      end
+
+      # This rule has no params
+      # @return [Hash] params
+      def params
+        {}
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/rules/guid.rb

@@ -0,0 +1,28 @@
+module Validation
+  module Rule
+    # GUID validation rule
+    #
+    # Valid is a +String+ that is at least 16 chars long and contains only:
+    # * Letters: a-z
+    # * Numbers: 0-9
+    # * Special chars: '-', '_', '@', '.' and ':'
+    class Guid
+      # The error key for this rule
+      # @return [Symbol] error key
+      def error_key
+        :guid
+      end
+
+      # Determines if value is a valid +GUID+
+      def valid_value?(value)
+        value.is_a?(String) && value.downcase =~ /\A[0-9a-z\-_@.:]{16,}\z/
+      end
+
+      # This rule has no params
+      # @return [Hash] params
+      def params
+        {}
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/rules/nilable_uri.rb

@@ -0,0 +1,19 @@
+module Validation
+  module Rule
+    # URI validation rule
+
+    # It allows +nil+, so maybe add an additional {Rule::NotNil} rule.
+    class NilableURI < Validation::Rule::URI
+      # The error key for this rule
+      # @return [Symbol] error key
+      def error_key
+        :nilableURI
+      end
+
+      # Determines if value is a valid URI
+      def valid_value?(uri_string)
+        uri_string.nil? || super
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/rules/not_nil.rb

@@ -0,0 +1,23 @@
+module Validation
+  module Rule
+    # Validates that a property is not +nil+
+    class NotNil
+      # The error key for this rule
+      # @return [Symbol] error key
+      def error_key
+        :not_nil
+      end
+
+      # Determines if value is not nil
+      def valid_value?(value)
+        !value.nil?
+      end
+
+      # This rule has no params
+      # @return [Hash] params
+      def params
+        {}
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/rules/public_key.rb

@@ -0,0 +1,33 @@
+module Validation
+  module Rule
+    # Public key validation rule
+    #
+    # A valid key must:
+    # * start with "-----BEGIN PUBLIC KEY-----" and end with "-----END PUBLIC KEY-----"
+    # or
+    # * start with "-----BEGIN RSA PUBLIC KEY-----" and end with "-----END RSA PUBLIC KEY-----"
+    class PublicKey
+      # The error key for this rule
+      # @return [Symbol] error key
+      def error_key
+        :public_key
+      end
+
+      # Determines if value is a valid public key
+      def valid_value?(value)
+        !value.nil? && (
+          (value.strip.start_with?("-----BEGIN PUBLIC KEY-----") &&
+           value.strip.end_with?("-----END PUBLIC KEY-----")) ||
+          (value.strip.start_with?("-----BEGIN RSA PUBLIC KEY-----") &&
+            value.strip.end_with?("-----END RSA PUBLIC KEY-----"))
+        )
+      end
+
+      # This rule has no params
+      # @return [Hash] params
+      def params
+        {}
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/rules/tag_count.rb

@@ -0,0 +1,34 @@
+module Validation
+  module Rule
+    # Rule for validating the number of tags in a string.
+    # Only the "#" characters will be counted.
+    # The string can be nil.
+    class TagCount
+      # This rule must have a +maximum+ param
+      # @return [Hash] params
+      attr_reader :params
+
+      # create a new rule for a maximum tag count validation
+      # @param [Hash] params
+      # @option params [Fixnum] :maximum maximum allowed tag count
+      def initialize(params)
+        unless params.include?(:maximum) && params[:maximum].is_a?(Fixnum)
+          raise ArgumentError, "A number has to be specified for :maximum"
+        end
+
+        @params = params
+      end
+
+      # The error key for this rule
+      # @return [Symbol] error key
+      def error_key
+        :tag_count
+      end
+
+      # Determines if value doesn't have more than +maximum+ tags
+      def valid_value?(value)
+        value.nil? || value.count("#") <= params[:maximum]
+      end
+    end
+  end
+end

data/lib/diaspora_federation/validators/web_finger_validator.rb

@@ -0,0 +1,20 @@
+module DiasporaFederation
+  module Validators
+    # This validates a {Discovery::WebFinger}
+    #
+    # @note it does not validate the guid and public key, because it will be
+    #   removed in the webfinger
+    class WebFingerValidator < Validation::Validator
+      include Validation
+
+      rule :acct_uri, :not_empty
+
+      rule :alias_url, [:not_nil, nilableURI: %i(host path)]
+      rule :hcard_url, [:not_nil, nilableURI: %i(host path)]
+      rule :seed_url, %i(not_nil nilableURI)
+      rule :profile_url, [:not_nil, nilableURI: %i(host path)]
+      rule :atom_url, [:not_nil, nilableURI: %i(host path)]
+      rule :salmon_url, [:not_nil, nilableURI: %i(host path)]
+    end
+  end
+end

data/lib/diaspora_federation/version.rb

@@ -1,4 +1,4 @@
 module DiasporaFederation
   # the gem version
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,6 +30,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.6
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: valid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: This gem provides the functionality for de-/serialization and de-/encryption
   of Entities in the protocols used for communication among the various installations
   of Diaspora*
@@ -43,16 +99,34 @@ files:
 - README.md
 - lib/diaspora_federation.rb
 - lib/diaspora_federation/callbacks.rb
+- lib/diaspora_federation/discovery.rb
+- lib/diaspora_federation/discovery/discovery.rb
+- lib/diaspora_federation/discovery/exceptions.rb
+- lib/diaspora_federation/discovery/h_card.rb
+- lib/diaspora_federation/discovery/host_meta.rb
+- lib/diaspora_federation/discovery/web_finger.rb
+- lib/diaspora_federation/discovery/xrd_document.rb
+- lib/diaspora_federation/entities.rb
+- lib/diaspora_federation/entities/person.rb
+- lib/diaspora_federation/entities/profile.rb
 - lib/diaspora_federation/entity.rb
+- lib/diaspora_federation/fetcher.rb
 - lib/diaspora_federation/logging.rb
 - lib/diaspora_federation/properties_dsl.rb
+- lib/diaspora_federation/validators.rb
+- lib/diaspora_federation/validators/h_card_validator.rb
+- lib/diaspora_federation/validators/person_validator.rb
+- lib/diaspora_federation/validators/profile_validator.rb
+- lib/diaspora_federation/validators/rules/birthday.rb
+- lib/diaspora_federation/validators/rules/boolean.rb
+- lib/diaspora_federation/validators/rules/diaspora_id.rb
+- lib/diaspora_federation/validators/rules/guid.rb
+- lib/diaspora_federation/validators/rules/nilable_uri.rb
+- lib/diaspora_federation/validators/rules/not_nil.rb
+- lib/diaspora_federation/validators/rules/public_key.rb
+- lib/diaspora_federation/validators/rules/tag_count.rb
+- lib/diaspora_federation/validators/web_finger_validator.rb
 - lib/diaspora_federation/version.rb
-- lib/diaspora_federation/web_finger.rb
-- lib/diaspora_federation/web_finger/exceptions.rb
-- lib/diaspora_federation/web_finger/h_card.rb
-- lib/diaspora_federation/web_finger/host_meta.rb
-- lib/diaspora_federation/web_finger/web_finger.rb
-- lib/diaspora_federation/web_finger/xrd_document.rb
 - lib/tasks/build.rake
 - lib/tasks/diaspora_federation_tasks.rake
 - lib/tasks/tests.rake