stix_schema_spy 1.0 → 1.1

data/config/1.1.1/uber_schema.xsd

@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema">
+  <import namespace="http://stix.mitre.org/Campaign-1" schemaLocation="campaign.xsd"/>
+  <import namespace="http://stix.mitre.org/CourseOfAction-1" schemaLocation="course_of_action.xsd"/>
+  <import namespace="http://cybox.mitre.org/common-2" schemaLocation="cybox/cybox_common.xsd"/>
+  <import namespace="http://cybox.mitre.org/cybox-2" schemaLocation="cybox/cybox_core.xsd"/>
+  <import namespace="http://cybox.mitre.org/default_vocabularies-2" schemaLocation="cybox/cybox_default_vocabularies.xsd"/>
+  <import namespace="http://cybox.mitre.org/extensions/Address#CIQAddress3.0-1" schemaLocation="cybox/extensions/location/ciq_address_3.0.xsd"/>
+  <import namespace="http://cybox.mitre.org/extensions/platform#CPE2.3-1" schemaLocation="cybox/extensions/platform/cpe2.3.xsd"/>
+  <import namespace="http://cpe.mitre.org/language/2.0" schemaLocation="external/cvrf_1.1/cpe-language_2.2a.xsd"/>
+  <import namespace="http://cpe.mitre.org/naming/2.0" schemaLocation="cybox/external/cpe_2.3/cpe-naming_2.3.xsd"/>
+  <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="external/cvrf_1.1/xml.xsd"/>
+  <import namespace="urn:oasis:names:tc:ciq:ct:3" schemaLocation="external/oasis_ciq_3.0/CommonTypes.xsd"/>
+  <import namespace="urn:oasis:names:tc:ciq:xal:3" schemaLocation="external/oasis_ciq_3.0/xAL.xsd"/>
+  <import namespace="http://www.w3.org/1999/xlink" schemaLocation="external/oasis_ciq_3.0/xlink-2003-12-31.xsd"/>
+  <import namespace="urn:oasis:names:tc:ciq:xnal:3" schemaLocation="external/oasis_ciq_3.0/xNAL.xsd"/>
+  <import namespace="urn:oasis:names:tc:ciq:xnl:3" schemaLocation="external/oasis_ciq_3.0/xNL.xsd"/>
+  <import namespace="urn:oasis:names:tc:ciq:xpil:3" schemaLocation="external/oasis_ciq_3.0/xPIL.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#AccountObject-2" schemaLocation="cybox/objects/Account_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#AddressObject-2" schemaLocation="cybox/objects/Address_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#APIObject-2" schemaLocation="cybox/objects/API_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#ArchiveFileObject-1" schemaLocation="cybox/objects/Archive_File_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#ARPCacheObject-1" schemaLocation="cybox/objects/ARP_Cache_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#ArtifactObject-2" schemaLocation="cybox/objects/Artifact_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#ASObject-1" schemaLocation="cybox/objects/AS_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#CodeObject-2" schemaLocation="cybox/objects/Code_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#CustomObject-1" schemaLocation="cybox/objects/Custom_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#DeviceObject-2" schemaLocation="cybox/objects/Device_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#DiskObject-2" schemaLocation="cybox/objects/Disk_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#DiskPartitionObject-2" schemaLocation="cybox/objects/Disk_Partition_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#DNSCacheObject-2" schemaLocation="cybox/objects/DNS_Cache_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#DNSQueryObject-2" schemaLocation="cybox/objects/DNS_Query_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#DNSRecordObject-2" schemaLocation="cybox/objects/DNS_Record_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#DomainNameObject-1" schemaLocation="cybox/objects/Domain_Name_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#EmailMessageObject-2" schemaLocation="cybox/objects/Email_Message_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#FileObject-2" schemaLocation="cybox/objects/File_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#GUIDialogboxObject-2" schemaLocation="cybox/objects/GUI_Dialogbox_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#GUIObject-2" schemaLocation="cybox/objects/GUI_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#GUIWindowObject-2" schemaLocation="cybox/objects/GUI_Window_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#HostnameObject-1" schemaLocation="cybox/objects/Hostname_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#HTTPSessionObject-2" schemaLocation="cybox/objects/HTTP_Session_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#ImageFileObject-1" schemaLocation="cybox/objects/Image_File_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#LibraryObject-2" schemaLocation="cybox/objects/Library_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#LinkObject-1" schemaLocation="cybox/objects/Link_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#LinuxPackageObject-2" schemaLocation="cybox/objects/Linux_Package_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#MemoryObject-2" schemaLocation="cybox/objects/Memory_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#MutexObject-2" schemaLocation="cybox/objects/Mutex_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#NetworkConnectionObject-2" schemaLocation="cybox/objects/Network_Connection_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#NetworkFlowObject-2" schemaLocation="cybox/objects/Network_Flow_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#PacketObject-2" schemaLocation="cybox/objects/Network_Packet_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#NetworkRouteEntryObject-2" schemaLocation="cybox/objects/Network_Route_Entry_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#NetworkRouteObject-2" schemaLocation="cybox/objects/Network_Route_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#NetworkSocketObject-2" schemaLocation="cybox/objects/Network_Socket_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#NetworkSubnetObject-2" schemaLocation="cybox/objects/Network_Subnet_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#PDFFileObject-1" schemaLocation="cybox/objects/PDF_File_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#PipeObject-2" schemaLocation="cybox/objects/Pipe_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#PortObject-2" schemaLocation="cybox/objects/Port_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#ProcessObject-2" schemaLocation="cybox/objects/Process_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#ProductObject-2" schemaLocation="cybox/objects/Product_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#SemaphoreObject-2" schemaLocation="cybox/objects/Semaphore_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#SMSMessageObject-1" schemaLocation="cybox/objects/SMS_Message_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#SocketAddressObject-1" schemaLocation="cybox/objects/Socket_Address_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#SystemObject-2" schemaLocation="cybox/objects/System_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#UnixFileObject-2" schemaLocation="cybox/objects/Unix_File_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#UnixNetworkRouteEntryObject-2" schemaLocation="cybox/objects/Unix_Network_Route_Entry_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#UnixPipeObject-2" schemaLocation="cybox/objects/Unix_Pipe_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#UnixProcessObject-2" schemaLocation="cybox/objects/Unix_Process_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#UnixUserAccountObject-2" schemaLocation="cybox/objects/Unix_User_Account_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#UnixVolumeObject-2" schemaLocation="cybox/objects/Unix_Volume_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#URIObject-2" schemaLocation="cybox/objects/URI_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#URLHistoryObject-1" schemaLocation="cybox/objects/URL_History_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#UserAccountObject-2" schemaLocation="cybox/objects/User_Account_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#UserSessionObject-2" schemaLocation="cybox/objects/User_Session_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#VolumeObject-2" schemaLocation="cybox/objects/Volume_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WhoisObject-2" schemaLocation="cybox/objects/Whois_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinComputerAccountObject-2" schemaLocation="cybox/objects/Win_Computer_Account_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinCriticalSectionObject-2" schemaLocation="cybox/objects/Win_Critical_Section_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinDriverObject-3" schemaLocation="cybox/objects/Win_Driver_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinEventLogObject-2" schemaLocation="cybox/objects/Win_Event_Log_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinEventObject-2" schemaLocation="cybox/objects/Win_Event_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinExecutableFileObject-2" schemaLocation="cybox/objects/Win_Executable_File_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinFilemappingObject-1" schemaLocation="cybox/objects/Win_Filemapping_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinFileObject-2" schemaLocation="cybox/objects/Win_File_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinHandleObject-2" schemaLocation="cybox/objects/Win_Handle_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinHookObject-1" schemaLocation="cybox/objects/Win_Hook_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinKernelHookObject-2" schemaLocation="cybox/objects/Win_Kernel_Hook_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinKernelObject-2" schemaLocation="cybox/objects/Win_Kernel_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinMailslotObject-2" schemaLocation="cybox/objects/Win_Mailslot_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinMemoryPageRegionObject-2" schemaLocation="cybox/objects/Win_Memory_Page_Region_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinMutexObject-2" schemaLocation="cybox/objects/Win_Mutex_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinNetworkRouteEntryObject-2" schemaLocation="cybox/objects/Win_Network_Route_Entry_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinNetworkShareObject-2" schemaLocation="cybox/objects/Win_Network_Share_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinPipeObject-2" schemaLocation="cybox/objects/Win_Pipe_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinPrefetchObject-2" schemaLocation="cybox/objects/Win_Prefetch_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinProcessObject-2" schemaLocation="cybox/objects/Win_Process_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinRegistryKeyObject-2" schemaLocation="cybox/objects/Win_Registry_Key_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinSemaphoreObject-2" schemaLocation="cybox/objects/Win_Semaphore_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinServiceObject-2" schemaLocation="cybox/objects/Win_Service_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinSystemObject-2" schemaLocation="cybox/objects/Win_System_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinSystemRestoreObject-2" schemaLocation="cybox/objects/Win_System_Restore_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinTaskObject-2" schemaLocation="cybox/objects/Win_Task_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinThreadObject-2" schemaLocation="cybox/objects/Win_Thread_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinUserAccountObject-2" schemaLocation="cybox/objects/Win_User_Account_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinVolumeObject-2" schemaLocation="cybox/objects/Win_Volume_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#WinWaitableTimerObject-2" schemaLocation="cybox/objects/Win_Waitable_Timer_Object.xsd"/>
+  <import namespace="http://cybox.mitre.org/objects#X509CertificateObject-2" schemaLocation="cybox/objects/X509_Certificate_Object.xsd"/>
+  <import namespace="http://data-marking.mitre.org/Marking-1" schemaLocation="data_marking.xsd"/>
+  <import namespace="http://stix.mitre.org/ExploitTarget-1" schemaLocation="exploit_target.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/Address#CIQAddress3.0-1" schemaLocation="extensions/address/ciq_3.0_address.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/AP#CAPEC2.7-1" schemaLocation="extensions/attack_pattern/capec_2.7_attack_pattern.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/Identity#CIQIdentity3.0-1" schemaLocation="extensions/identity/ciq_3.0_identity.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/Malware#MAEC4.1-1" schemaLocation="extensions/malware/maec_4.1_malware.xsd"/>
+  <import namespace="http://data-marking.mitre.org/extensions/MarkingStructure#Simple-1" schemaLocation="extensions/marking/simple_marking.xsd"/>
+  <import namespace="http://data-marking.mitre.org/extensions/MarkingStructure#Terms_Of_Use-1" schemaLocation="extensions/marking/terms_of_use_marking.xsd"/>
+  <import namespace="http://data-marking.mitre.org/extensions/MarkingStructure#TLP-1" schemaLocation="extensions/marking/tlp_marking.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/StructuredCOA#Generic-1" schemaLocation="extensions/structured_coa/generic_structured_coa.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/TestMechanism#Generic-1" schemaLocation="extensions/test_mechanism/generic_test_mechanism.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/TestMechanism#OpenIOC2010-1" schemaLocation="extensions/test_mechanism/open_ioc_2010_test_mechanism.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/TestMechanism#OVAL5.10-1" schemaLocation="extensions/test_mechanism/oval_5.10_test_mechanism.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/TestMechanism#Snort-1" schemaLocation="extensions/test_mechanism/snort_test_mechanism.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/TestMechanism#YARA-1" schemaLocation="extensions/test_mechanism/yara_test_mechanism.xsd"/>
+  <import namespace="http://stix.mitre.org/extensions/Vulnerability#CVRF-1" schemaLocation="extensions/vulnerability/cvrf_1.1_vulnerability.xsd"/>
+  <import namespace="http://capec.mitre.org/capec-2" schemaLocation="external/capec_2.7/ap_schema_v2.7.xsd"/>
+  <import namespace="http://www.icasi.org/CVRF/schema/common/1.1" schemaLocation="external/cvrf_1.1/common.xsd"/>
+  <import namespace="http://www.icasi.org/CVRF/schema/cvrf/1.1" schemaLocation="external/cvrf_1.1/cvrf.xsd"/>
+  <import namespace="http://scap.nist.gov/schema/cvss-v2/1.0" schemaLocation="external/cvrf_1.1/cvss-v2_0.9.xsd"/>
+  <import namespace="http://purl.org/dc/elements/1.1/" schemaLocation="external/cvrf_1.1/dc.xsd"/>
+  <import namespace="http://www.icasi.org/CVRF/schema/prod/1.1" schemaLocation="external/cvrf_1.1/prod.xsd"/>
+  <import namespace="http://scap.nist.gov/schema/scap-core/1.0" schemaLocation="external/cvrf_1.1/scap-core_0.9.xsd"/>
+  <import namespace="http://www.icasi.org/CVRF/schema/vuln/1.1" schemaLocation="external/cvrf_1.1/vuln.xsd"/>
+  <import namespace="http://maec.mitre.org/XMLSchema/maec-bundle-4" schemaLocation="external/maec_4.1/maec_bundle_schema.xsd"/>
+  <import namespace="http://maec.mitre.org/XMLSchema/maec-container-2" schemaLocation="external/maec_4.1/maec_container_schema.xsd"/>
+  <import namespace="http://maec.mitre.org/default_vocabularies-1" schemaLocation="external/maec_4.1/maec_default_vocabularies.xsd"/>
+  <import namespace="http://maec.mitre.org/XMLSchema/maec-package-2" schemaLocation="external/maec_4.1/maec_package_schema.xsd"/>
+  <import namespace="http://xml/metadataSharing.xsd" schemaLocation="external/maec_4.1/metadataSharing.xsd"/>
+  <import namespace="http://schemas.mandiant.com/2010/ioc/TR/" schemaLocation="external/open_ioc_2010/ioc-TR.xsd"/>
+  <import namespace="http://schemas.mandiant.com/2010/ioc" schemaLocation="external/open_ioc_2010/ioc.xsd"/>
+  <import namespace="http://oval.mitre.org/XMLSchema/oval-common-5" schemaLocation="external/oval_5.10/oval-common-schema.xsd"/>
+  <import namespace="http://oval.mitre.org/XMLSchema/oval-definitions-5" schemaLocation="external/oval_5.10/oval-definitions-schema.xsd"/>
+  <import namespace="http://oval.mitre.org/XMLSchema/oval-variables-5" schemaLocation="external/oval_5.10/oval-variables-schema.xsd"/>
+  <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="external/oval_5.10/xmldsig-core-schema.xsd"/>
+  <import namespace="http://stix.mitre.org/Incident-1" schemaLocation="incident.xsd"/>
+  <import namespace="http://stix.mitre.org/Indicator-2" schemaLocation="indicator.xsd"/>
+  <import namespace="http://stix.mitre.org/common-1" schemaLocation="stix_common.xsd"/>
+  <import namespace="http://stix.mitre.org/stix-1" schemaLocation="stix_core.xsd"/>
+  <import namespace="http://stix.mitre.org/default_vocabularies-1" schemaLocation="stix_default_vocabularies.xsd"/>
+  <import namespace="http://stix.mitre.org/ThreatActor-1" schemaLocation="threat_actor.xsd"/>
+  <import namespace="http://stix.mitre.org/TTP-1" schemaLocation="ttp.xsd"/>
+</schema>

data/lib/stix_schema_spy/models/attribute.rb

@@ -14,7 +14,7 @@ module StixSchemaSpy
     end
 
     def use
-      @xml.attributes['use'].try(:value) || "optional"
+      @xml.attributes['use'] ? @xml.attributes['use'].value : "optional"
     end
   end
 end

data/lib/stix_schema_spy/models/element.rb

@@ -9,18 +9,11 @@ module StixSchemaSpy
     end
 
     def min_occurs
-      @xml.attributes['minOccurs'].try(:value) || "1"
+      @xml.attributes['minOccurs'] ? @xml.attributes['minOccurs'].value : "1"
     end
 
     def max_occurs
-      case value = @xml.attributes['maxOccurs'].try(:value)
-      when nil
-        "1"
-      when "unbounded"
-        "n"
-      else
-        value
-      end
+      @xml.attributes['maxOccurs'] ? @xml.attributes['maxOccurs'].value : "1"
     end
   end
 end

data/lib/stix_schema_spy/models/external_type.rb

@@ -13,6 +13,35 @@ module StixSchemaSpy
       @prefix || ""
     end
 
+    # For compatibility w/ normal types
+    def use(by)
+      return self
+    end
+
+    def usages
+      []
+    end
+
+    def own_usages
+      []
+    end
+
+    def use_parent(child)
+      self
+    end
+
+    def child_types
+      []
+    end
+
+    def abstract?
+      false
+    end
+
+    def has_own_fields?
+      false
+    end
+
     def full_name
       if prefix && prefix.length > 0
         "#{prefix}:#{name}"

data/lib/stix_schema_spy/models/has_children.rb

@@ -4,8 +4,8 @@ module StixSchemaSpy
       load!
       if @elements[name]
         @elements[name]
-      elsif extension && all
-        extension.find_element(name)
+      elsif parent_type && all
+        parent_type.find_element(name)
       else
         nil
       end
@@ -15,8 +15,8 @@ module StixSchemaSpy
       load!
       if @attributes[name]
         @attributes[name]
-      elsif extension && all
-        extension.find_attribute(name)
+      elsif parent_type && all
+        parent_type.find_attribute(name)
       else
         nil
       end
@@ -24,12 +24,12 @@ module StixSchemaSpy
 
     def elements(all = true)
       load!
-      (@elements.values + (all && extension ? extension.elements : []))
+      (@elements.values + (all && parent_type ? parent_type.elements : []))
     end
 
     def attributes(all = true)
       load!
-      (@attributes.values + (all && extension ? extension.attributes : []))
+      (@attributes.values + (all && parent_type ? parent_type.attributes : []))
     end
 
     def own_fields
@@ -39,7 +39,7 @@ module StixSchemaSpy
 
     def fields
       load!
-      (!extension.nil? ? extension.fields : []) + own_fields
+      (parent_type ? parent_type.fields : []) + own_fields
     end
     
     #################################################################################################
@@ -51,10 +51,10 @@ module StixSchemaSpy
       if ['complexContent', 'simpleContent', 'sequence', 'group', 'choice', 'extension'].include?(child.name)
         child.elements.each {|grandchild| process_field(grandchild)}
       elsif child.name == 'element'
-        element = Element.new(child, self.schema)
+        element = Element.new(child, self.schema, self)
         @elements[element.name] = element
       elsif child.name == 'attribute'
-        attribute = Attribute.new(child, self.schema)
+        attribute = Attribute.new(child, self.schema, self)
         @attributes[attribute.name] = attribute
       elsif child.name == 'complexType'
         type = ComplexType.build(child, self.schema)

data/lib/stix_schema_spy/models/node.rb

@@ -2,11 +2,12 @@
 
 module StixSchemaSpy
   class Node
-    attr_reader :documentation, :schema
+    attr_reader :documentation, :schema, :containing_type
 
-    def initialize(xml, schema)
+    def initialize(xml, schema, containing_type = nil)
       @xml = xml
       @schema = schema
+      @containing_type = containing_type
       @documentation = @xml.xpath('xs:annotation/xs:documentation', {'xs' => 'http://www.w3.org/2001/XMLSchema'}).to_a.map {|node| node.text}.join("\n")
     end
 
@@ -29,15 +30,15 @@ module StixSchemaSpy
     def type!
       if reference?
         if referenced_element
-          referenced_element.type
+          referenced_element.type.use(self)
         else        
-          ExternalType.new(*@xml.attributes['ref'].value.split(':'))
+          ExternalType.new(*@xml.attributes['ref'].value.split(':')).use(self)
         end
       elsif named_type = @xml.attributes['type']
         type = schema.find_type(named_type.value) || Type.find(named_type.value)
-        type
+        type.use(self)
       else
-        Type.inline(@xml, self.schema, self.name)
+        Type.inline(@xml, self.schema, self.name).use(self)
       end
     end
 

data/lib/stix_schema_spy/models/schema.rb

@@ -74,8 +74,8 @@ module StixSchemaSpy
     end
 
     # Again, just for compatibility with Type
-    def extension
-      nil
+    def parent_type
+      false
     end
 
     # More compatibility with type
@@ -157,7 +157,7 @@ module StixSchemaSpy
     end
 
     def self.namespaces
-      self.all.inject({'xs' => 'http://www.w3.org/2001/XMLSchema'}) {|coll, schema| coll[schema.prefix] = schema.namespace; coll}
+      self.all.inject({'xs' => 'http://www.w3.org/2001/XMLSchema', 'xsi' => 'http://www.w3.org/2001/XMLSchema-instance'}) {|coll, schema| coll[schema.prefix] = schema.namespace; coll}
     end
 
     def self.schema_dir
@@ -165,7 +165,7 @@ module StixSchemaSpy
     end
 
     def self.version
-      "1.1"
+      "1.1.1"
     end
 
     # Don't process non STIX or CybOX schemas
@@ -198,6 +198,8 @@ module StixSchemaSpy
       Dir.glob("#{schema_dir}/stix/*.xsd").each {|f| self.build(f)}
       Dir.glob("#{schema_dir}/stix/extensions/**/*.xsd").each {|f| self.build(f)}
       @uber_schema = Dir.chdir(schema_dir) {Nokogiri::XML::Schema.new(File.read('uber_schema.xsd'))}
+      Schema.all.each(&:preload!)
+      return true
     end
 
     def self.schema_root

data/lib/stix_schema_spy/models/type.rb

@@ -3,7 +3,7 @@
 module StixSchemaSpy
   class Type
 
-    attr_reader :name, :documentation, :extension, :schema, :inline
+    attr_reader :name, :documentation, :schema, :inline
 
     def initialize(xml, schema, inline = false)
       @inline = !!inline
@@ -11,7 +11,7 @@ module StixSchemaSpy
       @xml = xml
       @name = xml.attributes['name'] ? xml.attributes['name'].value : "#{inline}InlineType"
       @documentation = xml.xpath('./xs:annotation/xs:documentation', {'xs' => 'http://www.w3.org/2001/XMLSchema'}).to_a.map {|node| node.text}.join("\n")
-      @extension = get_extension(xml)
+      
     end
 
     def full_name
@@ -21,9 +21,15 @@ module StixSchemaSpy
     def get_extension(type)
       if node = type.xpath('xs:complexContent/xs:extension | xs:simpleContent/xs:extension | xs:complexContent/xs:restriction | xs:simpleContent/xs:restriction', {'xs' => 'http://www.w3.org/2001/XMLSchema'}).first
         base = node.attributes['base'].value
-        schema.find_type(base) || Type.find(base)
+        parent = schema.find_type(base) || Type.find(base)
+        if parent.nil?
+          puts "Unable to find base type #{base} for extended type #{full_name}"
+          return false
+        else
+          return parent.use_parent(self)
+        end
       else
-        nil
+        false
       end
     end
 
@@ -32,7 +38,8 @@ module StixSchemaSpy
     end
 
     def parent_type
-      @extension
+      @extension = get_extension(@xml) if @extension.nil?
+      return @extension
     end
 
     # URL is just the prefix/type
@@ -90,6 +97,38 @@ module StixSchemaSpy
       end
     end
 
+    def use(by)
+      @usages ||= []
+      @usages.push(by)
+      return self
+    end
+
+    def own_usages
+      @usages || []
+    end
+
+    def usages
+      if parent_type
+        (own_usages + parent_type.usages).flatten.uniq
+      else
+        own_usages.uniq
+      end
+    end
+
+    def use_parent(child)
+      @child_types ||= []
+      @child_types << child
+      self
+    end
+
+    def child_types
+      (@child_types || []).uniq
+    end
+
+    def has_own_fields?
+      fields.length > 0 && (parent_type.nil? || parent_type.fields.length != fields.length)
+    end
+
     def prefix
       @schema.prefix
     end

data/lib/stix_schema_spy/util/tasks.rb

@@ -3,16 +3,19 @@ require 'nokogiri'
 
 namespace :stix_schema_spy do
 
-  desc "Generate the uber-schema that can be used to validate against a single file"
-  task :generate_schemas, :output_dir do |task, args|
-    output_dir = args[:output_dir] ? File.expand_path(args[:output_dir]) : nil
+  desc "Convert the STIX source schemas into compiled schemas useful for validation. Mainly used to update the schemas within stix_schema_spy itself."
+  task :generate_schemas, [:input_dir, :output_dir] do |task, args|
+    schema_dir = args[:input_dir]
+    output_dir = File.expand_path(args[:output_dir])
+    stix_dir = output_dir + "/stix"
+
+    raise "Please specify the schemas directory and the output directory" if schema_dir.nil? || output_dir.nil?
 
     import_chains = Hash.new([])
     namespace_map = {}
-    schema_dir = File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'schemas')
 
-    # Create the output directory if we need one
-    FileUtils.mkdir_p(output_dir) if output_dir
+    # Create the output directory
+    FileUtils.mkdir_p(stix_dir)
 
     # Collect each of the necessary schemas
     Dir.chdir(schema_dir) do
@@ -39,13 +42,11 @@ namespace :stix_schema_spy do
           coll[namespace] = schema_location unless import_chains[namespace].include?(filename) # Set this namespace's parent to the current schema unless any other includes point to it
 
           # Write the schema out to the target directory
-          if output_dir
-            directory = schema_location.split('/')[0..-2].join('/')
-            Dir.chdir(output_dir) {
-              FileUtils.mkdir_p(directory)
-              File.open(schema_location, "w") {|f| f.write(schema)}
-            }
-          end
+          directory = schema_location.split('/')[0..-2].join('/')
+          Dir.chdir(stix_dir) {
+            FileUtils.mkdir_p(directory) if directory.length > 0
+            File.open(schema_location, "w") {|f| f.write(schema)}
+          }
         end            
       end
     end
@@ -60,7 +61,7 @@ namespace :stix_schema_spy do
     end
 
     # Write the schema
-    Dir.chdir(output_dir || 'config/schemas') {
+    Dir.chdir(output_dir) {
       File.open("uber_schema.xsd", "w") {|f| f.write(doc.to_xml)}  
     }
     

data/lib/stix_schema_spy/version.rb

@@ -1,3 +1,3 @@
 module StixSchemaSpy
-  VERSION = "1.0"
+  VERSION = "1.1"
 end