diff --git a/docs/source/manual/img/members.png b/docs/source/manual/img/members.png index 8ce62474cfb..ccb9f5a5afc 100644 Binary files a/docs/source/manual/img/members.png and b/docs/source/manual/img/members.png differ diff --git a/docs/source/manual/img/object-details.png b/docs/source/manual/img/object-details.png new file mode 100644 index 00000000000..1408904becb Binary files /dev/null and b/docs/source/manual/img/object-details.png differ diff --git a/docs/source/manual/img/objects-clean-install.png b/docs/source/manual/img/objects-clean-install.png new file mode 100644 index 00000000000..cfd8df1cc10 Binary files /dev/null and b/docs/source/manual/img/objects-clean-install.png differ diff --git a/docs/source/manual/img/objects-clearance-types.png b/docs/source/manual/img/objects-clearance-types.png new file mode 100644 index 00000000000..1d4154a7a36 Binary files /dev/null and b/docs/source/manual/img/objects-clearance-types.png differ diff --git a/docs/source/manual/img/settings.png b/docs/source/manual/img/settings.png index ec5fbff633c..fb823700cd5 100644 Binary files a/docs/source/manual/img/settings.png and b/docs/source/manual/img/settings.png differ diff --git a/docs/source/manual/img/tasks-boefjes.png b/docs/source/manual/img/tasks-boefjes.png new file mode 100644 index 00000000000..eadb066ff9f Binary files /dev/null and b/docs/source/manual/img/tasks-boefjes.png differ diff --git a/docs/source/manual/img/tasks-normalizer-yielded-objects.png b/docs/source/manual/img/tasks-normalizer-yielded-objects.png new file mode 100644 index 00000000000..7cde8636a3e Binary files /dev/null and b/docs/source/manual/img/tasks-normalizer-yielded-objects.png differ diff --git a/docs/source/manual/img/tasks-normalizers.png b/docs/source/manual/img/tasks-normalizers.png new file mode 100644 index 00000000000..a95847fc8d1 Binary files /dev/null and b/docs/source/manual/img/tasks-normalizers.png differ diff --git a/docs/source/manual/user-manual.rst b/docs/source/manual/user-manual.rst index 8e5411c0d79..d866cd0e06a 100644 --- a/docs/source/manual/user-manual.rst +++ b/docs/source/manual/user-manual.rst @@ -79,35 +79,73 @@ One or more findings can be selected. The textbox at the bottom allows for a des Objects ------- -The Objects page lists all the objects in Octopus. For each object there is information about: +The Objects page lists all the objects in Octopoes. Objects can be anything, like DNS records, hostnames, URLs, software, software versions, ports, etc. It is any piece of information that is found by the normalizers, bits and boefjes. On a new installation you'll see the following objects by default: -- properties -- relationship with other objects -- findings -- level of safeguarding +.. image:: img/objects-clean-install.png + :alt: overview of default objects -The objects page is a practical page to find information about a host or system. The objects can be filtered and a report per object can be easily created and exported. +The table gives an overview on the following items: +- Object: this is the piece of data that was identified, such as a port, software version, hostname, etc. +- Object type: this shows how this object is labelled. +- Clearance level: this shows the clearance level of this object. +- Clearance type: this shows what kind of clearance level is set on the object. See `Object clearances` __ below for more information. -.. image:: img/findingsreportperobject.png - :alt: findings per object +The objects can be filtered by object types, clearance levels and clearance types. The search functionality can also be used to search for specific objects, such as hostnames. -The object detail page provides more information about a specific object, such as the number of findings for this object. More information can be requested per finding: +More information on objects is provided by clicking on the object. This will give an overview page with all information for the specific object. The object details page is further described below. -.. image:: img/findingdetail.png - :alt: finding detail + +Object clearances +----------------- +Each object has a clearance type. The clearance type tells how the object was added to the Objects list. The following object types are available: + +- Declared: declared objects were added by the user. +- Inherited: inherited objects were identified through propagation and the parsing of bits and normalizers. This means there is a relation to other object(s). +- Empty: empyth objects do not have a relation to other objects. + +The objects below show different clearance types for various objects. The hostname `mispo.es` was manually added and thus is `declared`. The DNS zone is `inherited` based on the DNS zone boefje. + +.. image:: img/objects-clearance-types.png + :alt: different object clearance types + +Object details +-------------- +Object details can be found by clicking on an object on the Objects page. Object details provide data on that specific object and how it relates to other objects. The following detail tabs are available: + +- Overview: the overview tab gives object details, it's declaration, related objects (objects that are somehow related), tasks that ran on this object, findings that are applicable to this object and a list of boefjes that can scan this object. +- Tree: the tree tab shows how all objects are related to this object. The point of view will be from the specific object. Thus the view for a hostname will be slightly different than the tree view for an IP address. Filters can be applied to the tree view. +- Graph: the graph tab visually shows how the objects are connected using lines. The graph is interactive, meaning you can click on objects in the graph. Filters can be applied to the graph view. +- Clearance level: the clearance level can be changed on the clearance level tab. This tab also shows the clearance type (declared, inherited, empty) and the inheritance tree for the object. +- Findings: the findings tab shows all findings that are linked to this object. Different objects have different findings, meaning that the Findings tab for a hostname is likely different from the findings tab for an IP address. + + +.. image:: img/object-details.png + :alt: object detail page Tasks ----- -The scans of KAT can be found on the Tasks page as tasks. A task is created per boefje and per normalizer, with a status. Per task, the object is displayed and the json with metadata can be downloaded. This includes the hash of the scan performed. +All tasks can be found on the Tasks page. A task is created for each job that needs to be performed, such as running a boefje, normalizer or for generating a report. Each task is performed on an object (such as a hostname, finding, DNS records, etc.) and tasks have a status to show if the task is completed, scheduled, queued, etc. Each task contains meta and raw data that can be downloaded. This is the output, error message, proof, security hashes, etc. that belongs to the boefje or normalizer. Tasks can also be rescheduled and filtered to find specific tasks. + +Tasks are organised between the boefje and normalizer tabs. The image below shows what the boefje tab could look like. + +.. image:: img/tasks-boefjes.png + :alt: overview of boefje tasks + +The image below shows the normalizer tasks by clicking on the normalizer tab. + +.. image:: img/tasks-normalizers.png + :alt: overview of normalizer tasks + +The normalizer tab has a special functionality called 'yielded objects'. If the normalizer was able to extract new data (points) this will result in new yielded objects. As an example below, the DNS records for the hostname `mispo.es` are parsed. The normalizer identifies various DNS records (A, NS, MX, SOA) and other information and creates objects for each of the identified information. This information is now also available to other tools to be parsed, if possible. -.. image:: img/boefjes.png - :alt: tasks +.. image:: img/tasks-normalizer-yielded-objects.png + :alt: yielded objects for normalizers Members ------- -The Members page allows for usermanagement and is visible to users who have the rights to do this. +The Members page allows for user management and is visible to users who have the rights to do this. When you have sufficient rights you can add new users either manually or through a file upload (CSV). This page also shows the accepted and assigned clearance levels to each user and whether or not the user is active. .. image:: img/members.png :alt: Members page @@ -115,11 +153,12 @@ The Members page allows for usermanagement and is visible to users who have the Settings -------- -The Settings page shows general information and its settings: +The Settings page shows general information and its settings. In some cases you might want to add tags to the organisation or decide to manually run all bits. This can be done from the settings page. If you created a new organization, you can also add the indemnification on this page. * Organization data * Indemnification * Rerun all bits on the current dataset +* Tags .. image:: img/settings.png :alt: Settings page