diff --git a/sharing/README.md b/sharing/README.md index 45a72e4..ff593ac 100644 --- a/sharing/README.md +++ b/sharing/README.md @@ -2,14 +2,13 @@ ## Sharing / Synchronisation -* [Explanation](#users) +* [Explanation](#concept) * [Setup](#setup) * [Rules](#rules) -* [Tools](#tools) -* [Server Settings](#server-settings) +* [Server Settings](#adding-a-server) * [Events](#events) * [Sharing groups](#sharing-groups) -* [Recommendations](#recommendations) +* [Recommendations](#recommendation) * MISP's core functionality is sharing where everyone can be a consumer and/or a contributor/producer. * Quick benefit without the obligation to contribute @@ -38,7 +37,7 @@ An organisation B (OrgB) wants to synchronise its MISP server, called ServerB, w * **Step 1**: Add OrgB as a local organisation on ServerA (OrgB.ServerA). * **Step 2**: Add a Sync User (syncuser@OrgB.ServerA) in the organisation OrgB.ServerA on the MISP ServerA. -* **Step 3**: [Set up a sync server](###adding-a-server) on MISP ServerB using the key (called Authkey) from the sync user (syncuser@OrgB.ServerA) created on MISP serverA. +* **Step 3**: [Set up a sync server](#adding-a-server) on MISP ServerB using the key (called Authkey) from the sync user (syncuser@OrgB.ServerA) created on MISP serverA. For additional information on the synchronisation process, refer to the [MISP GitHub issues](https://github.com/MISP/MISP/issues), for example [issue 2595](https://github.com/MISP/MISP/issues/2595). diff --git a/sharing/figures/misp-sync-servers.svg b/sharing/figures/misp-sync-servers.svg index e8356b2..7b53b7a 100644 --- a/sharing/figures/misp-sync-servers.svg +++ b/sharing/figures/misp-sync-servers.svg @@ -17,7 +17,7 @@ version="1.1" id="svg8" inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" - sodipodi:docname="misp-sync-server.svg"> + sodipodi:docname="misp-sync-servers.svg"> Organsiation - - OrgA.SeverA - - - - - User + id="g1977"> - - - + id="g1881"> - + User + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="161.33043" + y="81.417549" + id="text1647">OrgA.SeverA + + + + + + User + + + + + + + User + + + + + + + User + + - - - + id="g1914"> - + User - - OrgB.ServerA - - - - Sync User - - - - - User - - - - - - User + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="109.96315" + y="81.53093" + id="text1577">OrgB.ServerA + + + + + + Sync User + + + + + + + User + + + + + + + User + + - - OrgB.ServerB - - - - - User - - - + id="g2007"> - User - - - - - - User + y="75.436554" + x="8.9473619" + height="29.261854" + width="45.227303" + id="rect1128-1-6-0-0" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.14214589;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + OrgB.ServerB + + + + + + User + + + + + + + User + + + + + + + User + + + id="g5-1-2-2-2-8" + transform="matrix(0.14965509,0,0,0.14965509,134.52582,35.687092)"> + id="g7-5-0-5-0-1"> + id="g9-9-3-6-5-6"> - - - - - + id="g11-8-3-5-4-8"> + + + + + + - - - - - - - - - - - - - - Operatedby A - MISPServerA - + + + + + + + + + Operatedby A + MISPServerA + - Legend - - - - - - - Synchronisation between twoMISP servers - Organisation in the MISP databaseof a MISP server Organisation User of an organisation in the MISPdatabase of a MISP server + id="g2062"> + Legend: + + - - - - - - - - - - - - - - - - - - - - - - + transform="translate(0,4.2333335)" + id="g3331"> + id="path1088-9-7-2-9-0" + cx="17.094486" + cy="162.6606" + style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.36006752;stroke-opacity:1" + r="3.1367824" /> + + + + Synchronisation between twoMISP servers + + Organisation in the MISP databaseof a MISP server + Organisation + User of an organisation in the MISPdatabase of a MISP server + + + + + + + + + + + + + + + + + + + + + + + + + + + + MISP server (also called MISP instance) - MISP server (also called MISP instance) @@ -1563,59 +1649,55 @@ id="tspan1036-6" sodipodi:role="line" /> + id="g2082" + transform="matrix(1.2581629,0,0,1.2581629,-27.394347,-22.067732)"> 1 + transform="matrix(1.137605,0,0,1.0962957,61.193194,74.546053)">1 1 + x="97.914543" + y="78.779259">1 + id="g2086" + transform="matrix(1.2025094,0,0,1.2025094,-17.77181,-24.996134)"> 2 - - 2 - + transform="matrix(1.137605,0,0,1.0962957,62.769371,97.821058)">2 + 2 + id="g2090" + transform="matrix(1.2947565,0,0,1.2947565,-22.289826,-37.258286)"> 3 + transform="matrix(1.137605,0,0,1.0962957,33.762862,122.74571)">3 3 + x="70.318848" + y="126.50646">3