intrigue-ident 0.4 → 0.6

data/lib/traverse_exceptions.rb

@@ -0,0 +1,196 @@
+module Intrigue
+module Ident
+module TraverseExceptions
+
+    def non_traversable?(entity_name, type_string="DnsRecord")
+
+      if type_string == "IpAddress"
+        return true if (
+            # Skip Akamai
+            entity_name =~ /^23\..*$/              ||
+            entity_name =~ /^2600:1400.*$/         ||
+            entity_name =~ /^2600:1409.*$/         ||
+
+            # Skip Incapsula... lots of annoying scan results here
+            entity_name =~ /107\.154\.*/           ||
+
+            # RFC1918
+            #entity_name =~ /^172\.16\..*$/         ||
+            #entity_name =~ /^192\.168\..*$/        ||
+            #entity_name =~ /^10\..*$/              ||
+
+            # localhost
+            entity_name =~ /^127\..*$/             ||
+            entity_name =~ /^0.0.0.0/ )
+      end
+
+      if type_string == "DnsRecord" || type_string == "Uri"
+        # Standard exclusions
+        return true if (
+            entity_name =~ /^.*1e100.net(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*2o7.net(:[0-9]*)?$/                       ||
+            entity_name =~ /^.*akadns.net(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*akam.net(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*akamai.net(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*akamai.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*akamaiedge.net(:[0-9]*)?$/                ||
+            entity_name =~ /^.*akamaiedge-staging.net(:[0-9]*)?$/        ||
+            entity_name =~ /^.*akamaihd-staging.net(:[0-9]*)?$/          ||
+            entity_name =~ /^.*akamaihd.net(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*akamaistream.net(:[0-9]*)?$/              ||
+            entity_name =~ /^.*akamaitechnologies.net(:[0-9]*)?$/        ||
+            entity_name =~ /^.*akamaitechnologies.com(:[0-9]*)?$/        ||
+            entity_name =~ /^.*akamaized-staging.net(:[0-9]*)?$/         ||
+            entity_name =~ /^.*akamaized.net(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*amazonaws.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*android.clients.google.com(:[0-9]*)?$/    ||
+            entity_name =~ /^.*android.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*apache.org(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*\.arpa(:[0-9]*)?$/                        ||
+            entity_name =~ /^.*azure-mobile.net(:[0-9]*)?$/              ||
+            entity_name =~ /^.*azureedge-test.net(:[0-9]*)?$/            ||
+            entity_name =~ /^.*azureedge.net(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*azurewebsites.net(:[0-9]*)?$/             ||
+            entity_name =~ /^.*bigcommerce.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*bronto.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*bydiscourse.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*chtah.com(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*cheetahmail.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*clickdimensions.com(:[0-9]*)?$/           ||
+            entity_name =~ /^.*cloudapp.net(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*cloudfront.net(:[0-9]*)?$/                ||
+            entity_name =~ /^.*cloudflare-dns.com(:[0-9]*)?$/            ||
+            entity_name =~ /^.*corporate-ir.net(:[0-9]*)?$/              ||
+            entity_name =~ /^.*decipherinc.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*discourse.org(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*drupal.org(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*ed[0-9]+.com(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*edgecastcdn.net(:[0-9]*)?$/               ||
+            entity_name =~ /^.*edgekey.net(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*edgekey-staging.net(:[0-9]*)?$/           ||
+            entity_name =~ /^.*edgesuite.net(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*eloqua.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*exacttarget.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*facebook.com(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*feeds2.feedburner.com(:[0-9]*)?$/         ||
+            entity_name =~ /^.*force.com(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*g.co(:[0-9]*)?$/                          ||
+            entity_name =~ /^.*gandi.net(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*ghs.google.com(:[0-9]*)?$/                ||
+            entity_name =~ /^.*github.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*goo.gl(:[0-9]*)?$/                        ||
+            entity_name =~ /^.*google-analytics.com(:[0-9]*)?$/          ||
+            entity_name =~ /^.*githubapp.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*google.ca(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.cl(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.co.in(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*google.co.jp(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*google.co.uk(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*google.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*google.com.ar(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*google.com.au(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*google.com.br(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*google.com.co(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*google.com.mx(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*google.com.tr(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*google.com.vn(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*google.de(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.es(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.fr(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.hu(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.it(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.nl(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.pl(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*google.pt(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*googleadapis.com(:[0-9]*)?$/              ||
+            entity_name =~ /^.*googleapis.cn(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*googlecommerce.com(:[0-9]*)?$/            ||
+            entity_name =~ /^.*googlehosted.com(:[0-9]*)?$/              ||
+            entity_name =~ /^.*googlemail.com(:[0-9]*)?$/                ||
+            entity_name =~ /^.*gigya.com(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*gridserver.com(:[0-9]*)?$/                ||
+            entity_name =~ /^.*gstatic.cn(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*gstatic.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*gvt1.com(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*gvt2.com(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*herokuapp.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*herokudns.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*herokussl.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*hostgator.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*hscoscdn00.net(:[0-9]*)?$/                ||
+            entity_name =~ /^.*hubspot.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*hubspot.net(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*incapdns.net(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*incapsula.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*instagram.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*invision.net(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*jobing.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*localhost(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*lookbookhq.com(:[0-9]*)?$/                ||
+            entity_name =~ /^.*linkedin.com(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*live.net(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*live.com(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*lync.com(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*mailgun.org(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*mandrillapp.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*marketo.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*metric.gstatic.com(:[0-9]*)?$/            ||
+            entity_name =~ /^.*mktoweb.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*microsoft.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*b-msedge.net(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*mtsvc.net(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*msn.com(:[0-9]*)?$/                       ||
+            entity_name =~ /^.*oclc.org(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*office.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*office.net(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*office365.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*outlook.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*ogp.me(:[0-9]*)?$/                        ||
+            entity_name =~ /^.*outlook.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*pardot.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*photorank.me(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*plus.google.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*posterous.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*purl.org(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*q4web.com(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*rdfs.org(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*root-servers.net(:[0-9]*)?$/              ||
+            entity_name =~ /^.*schema.org(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*salesforce.com(:[0-9]*)?$/                ||
+            entity_name =~ /^.*sendgrid.net(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*secureserver.net(:[0-9]*)?$/              ||
+            entity_name =~ /^.*sharepoint.com(:[0-9]*)?$/                ||
+            entity_name =~ /^.*sharepointonline.com(:[0-9]*)?$/          ||
+            entity_name =~ /^.*siftscience.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*silverpop.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*squarespace.com(:[0-9]*)?$/               ||
+            entity_name =~ /^.*statuspage.io(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*statusio.com(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*twitter.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*uberflip.com(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*urchin.com(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*url.google.com(:[0-9]*)?$/                ||
+            entity_name =~ /^.*v0cdn.net(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*volusion.com(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*w3.org(:[0-9]*)?$/                        ||
+            entity_name =~ /^.*websitewelcome.com(:[0-9]*)?$/            ||
+            entity_name =~ /^.*windows.net(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*windowsphone-int.net(:[0-9]*)?$/          ||
+            entity_name =~ /^.*windowsphone.com(:[0-9]*)?$/              ||
+            entity_name =~ /^.*wordpress.com(:[0-9]*)?$/                 ||
+            entity_name =~ /^.*wpengine.com(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*www.goo.gl(:[0-9]*)?$/                    ||
+            entity_name =~ /^.*xmlns.com(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*youtu.be(:[0-9]*)?$/                      ||
+            entity_name =~ /^.*youtube-nocookie.com(:[0-9]*)?$/          ||
+            entity_name =~ /^.*youtube.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*youtubeeducation.com(:[0-9]*)?$/          ||
+            entity_name =~ /^.*ytimg.com(:[0-9]*)?$/                     ||
+            entity_name =~ /^.*zendesk.com(:[0-9]*)?$/                   ||
+            entity_name =~ /^.*zepheira.com(:[0-9]*)?$/                  ||
+            entity_name =~ /^.*1e100.com(:[0-9]*)?$/ )
+      end
+    end
+end
+end
+end

data/util/check.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require_relative "../lib/intrigue-ident"
+include Intrigue::Ident
+url = ARGV[0]
+debug = ARGV[1] || nil
+puts "Checking... #{url}"
+matches = generate_requests_and_check(url)
+
+if debug
+  puts "Debug: #{url}"
+  response = _http_request :get, "#{url}"
+  puts "Headers:"
+  response.each_header {|x| puts " - #{x}: #{response[x]}" }
+  puts "Body:"
+  puts response.body
+end
+
+puts "Results: "
+matches.each{|x| puts " - #{x[:cpe]}" } if matches
+puts "Done! #{matches.count} matches"

data/util/list.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require_relative "../lib/intrigue-ident"
+include Intrigue::Ident
+
+def list_checks
+  Intrigue::Ident::CheckFactory.all.map{|x| x.new.generate_checks("x") }.flatten
+end
+
+list_checks.sort_by{|c| "#{c[:vendor]}"}.each {|c| puts " - #{c[:vendor]} #{c[:product]} #{c[:version]} #{"(dynamic version detection)" if c[:dynamic_version] != nil }"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intrigue-ident
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.6'
 platform: ruby
 authors:
 - jcran
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,22 +61,33 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
-- ident.rb
+- data/logos/apache.png
+- data/logos/generic.png
+- data/logos/oracle_java.png
+- data/logos/php.png
+- data/logos/varnish.png
 - intrigue-ident.gemspec
 - lib/check_factory.rb
+- lib/checks/acquia.rb
+- lib/checks/adobe.rb
 - lib/checks/akamai.rb
 - lib/checks/amazon.rb
+- lib/checks/apache.rb
 - lib/checks/aruba.rb
-- lib/checks/asp_net.rb
 - lib/checks/atlassian.rb
+- lib/checks/automattic.rb
+- lib/checks/axis.rb
+- lib/checks/banu.rb
 - lib/checks/base.rb
+- lib/checks/checkpoint.rb
 - lib/checks/chef.rb
 - lib/checks/cisco.rb
 - lib/checks/citrix.rb
 - lib/checks/cloudflare.rb
-- lib/checks/cloudfront.rb
 - lib/checks/cpanel.rb
+- lib/checks/craft.rb
 - lib/checks/django.rb
+- lib/checks/docuwiki.rb
 - lib/checks/drupal.rb
 - lib/checks/f5.rb
 - lib/checks/fastly.rb
@@ -84,28 +95,67 @@ files:
 - lib/checks/gitlab.rb
 - lib/checks/google.rb
 - lib/checks/grafana.rb
+- lib/checks/groovy.rb
+- lib/checks/heroku.rb
+- lib/checks/hp.rb
+- lib/checks/ibm.rb
+- lib/checks/ivanti.rb
+- lib/checks/jamf.rb
+- lib/checks/jekyll.rb
 - lib/checks/jenkins.rb
+- lib/checks/jive.rb
+- lib/checks/jobvite.rb
 - lib/checks/joomla.rb
+- lib/checks/jupyter.rb
+- lib/checks/lighttpd.rb
 - lib/checks/limesuvey.rb
 - lib/checks/lithium.rb
+- lib/checks/lotus.rb
 - lib/checks/magento.rb
+- lib/checks/mailchimp.rb
 - lib/checks/mcafee.rb
 - lib/checks/mediawiki.rb
 - lib/checks/microsoft.rb
+- lib/checks/microtik.rb
 - lib/checks/nagios.rb
+- lib/checks/new_relic.rb
+- lib/checks/nginx.rb
+- lib/checks/okta.rb
+- lib/checks/ookla.rb
+- lib/checks/openresty.rb
 - lib/checks/oracle.rb
 - lib/checks/palo_alto.rb
+- lib/checks/pantheon.rb
 - lib/checks/pardot.rb
+- lib/checks/perfectsense.rb
 - lib/checks/pfsense.rb
+- lib/checks/php.rb
 - lib/checks/phpmyadmin.rb
+- lib/checks/ping_identity.rb
+- lib/checks/pivotal.rb
+- lib/checks/plesk.rb
+- lib/checks/pulse_secure.rb
 - lib/checks/rabbitmq.rb
-- lib/checks/spring.rb
+- lib/checks/restlet.rb
+- lib/checks/ruckus_wireless.rb
+- lib/checks/sailpoint.rb
+- lib/checks/sap.rb
+- lib/checks/tableau.rb
 - lib/checks/team_city.rb
 - lib/checks/telerik.rb
-- lib/checks/tomcat.rb
 - lib/checks/varnish.rb
-- lib/checks/wordpress.rb
+- lib/checks/vmware.rb
+- lib/checks/webmin.rb
 - lib/checks/wp_engine.rb
+- lib/checks/yaws.rb
+- lib/checks/zeit.rb
+- lib/checks/zendesk.rb
+- lib/checks/zimbra.rb
+- lib/checks/zscaler.rb
+- lib/intrigue-ident.rb
+- lib/traverse_exceptions.rb
+- util/check.rb
+- util/list.rb
 homepage: https://intrigue.io
 licenses:
 - BSD
@@ -114,7 +164,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- ident.rb
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/checks/asp_net.rb

@@ -1,70 +0,0 @@
-module Intrigue
-module Ident
-module Check
-class AspNet < Intrigue::Ident::Check::Base
-
-  def generate_checks(uri)
-    [
-      {
-        :accept => "Intrigue::Entity::Uri",
-        :name => "ASP.NET",
-        :description => "ASP.Net Error Message",
-        :version => nil,
-        :tags => ["error_page"],
-        :type => :content_body,
-        :content => /^.*ASP.NET is configured.*$/i,
-        :dynamic_version => lambda{|x| x.body.scan(/ASP.NET Version:(.*)$/)[0].first.chomp },
-        :paths => ["#{uri}"]
-      },
-      {
-        :accept => "Intrigue::Entity::Uri",
-        :name => "ASP.NET",
-        :description => "X-AspNet Header",
-        :version => nil,
-        :type => :content_headers,
-        :content => /^x-aspnet-version:.*$/i,
-        :dynamic_version => lambda{|x| x.body.scan(/ASP.NET Version:(.*)$/i)[0].first.chomp if x.body.scan(/ASP.NET Version:(.*)$/i)[0] },
-        :paths => ["#{uri}"]
-      },
-      {
-        :name => "ASP.NET",
-        :description => "Asp.Net Default Cookie",
-        :version => nil,
-        :type => :content_cookies,
-        :content => /ASPSESSIONID.*$/i,
-        :paths => ["#{uri}"]
-        #:dynamic_version => lambda{|x| x.each_header{|k,v| return v if k =~ /x-aspnet-version/ } }
-      },
-      {
-        :name => "ASP.NET",
-        :description => "Asp.Net Default Cookie",
-        :version => nil,
-        :type => :content_cookies,
-        :content => /ASP.NET_SessionId.*$/i,
-        :paths => ["#{uri}"]
-        #:dynamic_version => lambda{|x| x.each_header{|k,v| return v if k =~ /x-aspnet-version/ } }
-      },
-      {
-        :name => "ASP.NET MVC",
-        :description => "Asp.Net MVC Header",
-        :version => nil,
-        :type => :content_headers,
-        :content => /x-aspnetmvc-version/i,
-        :paths => ["#{uri}"]
-        #:dynamic_version => lambda{|x| x.each_header{|k,v| return v if k =~ /x-aspnetmvc-version/ } }
-      },
-      {
-        :name => "ASP.NET",
-        :description => "WebResource.axd link in the page",
-        :version => nil,
-        :type => :content_body,
-        :content => /WebResource.axd?d=/i,
-        :paths => ["#{uri}"]
-        #:dynamic_version => lambda{|x| x.each_header{|k,v| return v if k =~ /WebResource.axd?d=/ } }
-      }
-    ]
-  end
-end
-end
-end
-end

data/lib/checks/cloudfront.rb

@@ -1,41 +0,0 @@
-module Intrigue
-module Ident
-module Check
-    class Cloudfront < Intrigue::Ident::Check::Base
-
-      def generate_checks(uri)
-        [
-          {
-            :name => "Cloudfront - Error (Body)",
-            :description => "Cloudfront - no configured hostname",
-            :version => "",
-            :type => :content_body,
-            :content => /ERROR: The request could not be satisfied/,
-            :hide => true,
-            :paths => ["#{uri}"]
-          },
-          {
-            :name => "Cloudfront - Error (Headers)",
-            :description => "Cloudfront - no configured hostname",
-            :version => "",
-            :type => :content_headers,
-            :content => /Error from cloudfront/,
-            :hide => true,
-            :paths => ["#{uri}"]
-          },
-          {
-            :name => "Cloudfront - 403 (Body)",
-            :description => "Cloudfront - 403",
-            :version => "",
-            :type => :content_body,
-            :content => /<h1>403 Forbidden<\/h1><\/center>\n<hr><center>cloudflare/,
-            :hide => true,
-            :paths => ["#{uri}"]
-          }
-        ]
-      end
-
-    end
-  end
-  end
-  end