replace deprecated ExpandedPyMISP with PyMISP

examples/add_attributes_from_csv.py

@@ -3,7 +3,7 @@
 
 import csv
 from pymisp import PyMISP
-from pymisp import ExpandedPyMISP, MISPAttribute
+from pymisp import PyMISP, MISPAttribute
 from keys import misp_url, misp_key, misp_verifycert
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 import argparse
@@ -42,7 +42,7 @@
     parser.add_argument("-f", "--attr_file", required=True, help="Attribute CSV file path")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     f = open(args.attr_file, newline='')
     csv_reader = csv.reader(f, delimiter=";")

examples/add_fail2ban_object.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from pymisp.tools import Fail2BanObject
 import argparse
 from base64 import b64decode
@@ -43,7 +43,7 @@ def create_new_event():
     parser.add_argument("-d", "--disable_new", action='store_true', default=False, help="Do not create a new Event.")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     event_id = -1
     me = None
     if args.force_new:

examples/add_feed.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPFeed
+from pymisp import PyMISP, MISPFeed
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -14,7 +14,7 @@
     parser.add_argument("-p", "--provider", required=True, help="Provider name")
     args = parser.parse_args()
 
-    pm = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pm = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     feed = MISPFeed()
     feed.format = args.format
     feed.url = args.url

examples/add_filetype_object_from_csv.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import csv
-from pymisp import ExpandedPyMISP, MISPObject
+from pymisp import PyMISP, MISPObject
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -28,7 +28,7 @@
     parser.add_argument("-f", "--attr_file", required=True, help="Attribute CSV file path")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     f = open(args.attr_file, newline='')
     csv_reader = csv.reader(f, delimiter=";")

examples/add_generic_object.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import json
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from pymisp.tools import GenericObjectGenerator
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
@@ -19,7 +19,7 @@
     parser.add_argument("-l", "--attr_list", required=True, help="List of attributes")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     misp_object = GenericObjectGenerator(args.type.replace("|", "-"))
     misp_object.generate_attributes(json.loads(args.attr_list))

examples/add_named_attribute.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -19,7 +19,7 @@
     parser.add_argument("-v", "--value", help="The value of the attribute")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     event = misp.add_attribute(args.event, {'type': args.type, 'value': args.value}, pythonify=True)
     print(event)

examples/add_organisations.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPOrganisation, MISPSharingGroup
+from pymisp import PyMISP, MISPOrganisation, MISPSharingGroup
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import csv
@@ -17,7 +17,7 @@
     parser.add_argument("-c", "--csv-import", required=True, help="The CSV file containing the organizations. Format 'orgname,nationality,sector,type,contacts,uuid,local,sharingroup_uuid'")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     # CSV format
     #   orgname,nationality,sector,type,contacts,uuid,local,sharingroup

examples/add_ssh_authorized_keys.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from pymisp.tools import SSHAuthorizedKeysObject
 import traceback
 from keys import misp_url, misp_key, misp_verifycert
@@ -15,7 +15,7 @@
     parser.add_argument("-p", "--path", required=True, help="Path to process (expanded using glob).")
     args = parser.parse_args()
 
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
 
     for f in glob.glob(args.path):
         try:

examples/add_user.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPUser
+from pymisp import PyMISP, MISPUser
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -12,7 +12,7 @@
     parser.add_argument("-r", "--role_id", required=True, help="Role linked to the user.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, 'json')
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, 'json')
 
     user = MISPUser()
     user.email = args.email

examples/cache_all.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 from keys import misp_url, misp_key, misp_verifycert
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 
 
 if __name__ == '__main__':
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     misp.cache_all_feeds()

examples/create_events.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -14,7 +14,7 @@
     parser.add_argument("-t", "--threat", type=int, help="The threat level ID of the newly created event, if applicable. [1-4]")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     event = MISPEvent()
     event.distribution = args.distrib

examples/cytomic_orion.py

@@ -16,7 +16,7 @@
 
 '''
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import os
@@ -519,7 +519,7 @@ def process_attributes_delete(cytomicobj, moduleconfig):
 
     module_config = get_config(misp_url, misp_key, misp_verifycert)
     cytomicobj = cytomicobject
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=cytomicobject.debug)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, debug=cytomicobject.debug)
 
     cytomicobj.misp = misp
     cytomicobj.args = args

examples/del.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -13,7 +13,7 @@
 
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     if args.event:
         result = misp.delete_event(args.event)

examples/delete_user.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -11,6 +11,6 @@
     parser.add_argument("-i", "--user_id", help="The id of the user you want to delete.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     print(misp.delete_user(args.user_id))

examples/edit_organisation.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPOrganisation
+from pymisp import PyMISP, MISPOrganisation
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -11,7 +11,7 @@
     parser.add_argument("-e", "--email", help="Email linked to the organisation.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
 
     org = MISPOrganisation()
     org.id = args.organisation_id

examples/edit_user.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP, MISPUser
+from pymisp import PyMISP, MISPUser
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 
@@ -12,7 +12,7 @@
     parser.add_argument("-e", "--email", help="Email linked to the account.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     user = MISPUser
     user.id = args.user_id
     user.email = args.email

examples/events/create_massive_dummy_events.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 try:
     from keys import url, key
     verifycert = False
@@ -19,7 +19,7 @@
     parser.add_argument("-a", "--attribute", type=int, help="Number of attributes per event (default 3000)")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(url, key, verifycert)
+    misp = PyMISP(url, key, verifycert)
     misp.toggle_global_pythonify()
 
     if args.limit is None:

examples/falsepositive_disabletoids.py

@@ -11,7 +11,7 @@
 
 '''
 
-from pymisp import ExpandedPyMISP, MISPEvent
+from pymisp import PyMISP, MISPEvent
 from keys import misp_url, misp_key, misp_verifycert
 from datetime import datetime
 from datetime import date
@@ -30,7 +30,7 @@ def init(url, key, verifycert):
     '''
         Template to get MISP module started
     '''
-    return ExpandedPyMISP(url, key, verifycert, 'json')
+    return PyMISP(url, key, verifycert, 'json')
 
 
 if __name__ == '__main__':

examples/feed-generator/generate.py

@@ -3,7 +3,7 @@
 import sys
 import json
 import os
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from settings import url, key, ssl, outputdir, filters, valid_attribute_distribution_levels
 try:
     from settings import with_distribution
@@ -40,7 +40,7 @@ def init():
         valid_attribute_distributions = [int(v) for v in valid_attribute_distribution_levels]
     except Exception:
         valid_attribute_distributions = [0, 1, 2, 3, 4, 5]
-    return ExpandedPyMISP(url, key, ssl)
+    return PyMISP(url, key, ssl)
 
 
 def saveEvent(event, misp):

examples/fetch_events_feed.py

@@ -3,13 +3,13 @@
 
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Fetch all events from a feed.')
     parser.add_argument("-f", "--feed", required=True, help="feed's ID to be fetched.")
     args = parser.parse_args()
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert)
     misp.fetch_feed(args.feed)

examples/freetext.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 

examples/get.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 import argparse
 import os
@@ -27,7 +27,7 @@
         print('Output file already exists, abort.')
         exit(0)
 
-    misp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, proxies=proxies)
+    misp = PyMISP(misp_url, misp_key, misp_verifycert, proxies=proxies)
 
     event = misp.get_event(args.event, pythonify=True)
     if args.output:

examples/get_csv.py

@@ -3,7 +3,7 @@
 
 import argparse
 
-from pymisp import ExpandedPyMISP
+from pymisp import PyMISP
 from keys import misp_url, misp_key, misp_verifycert
 
 
@@ -18,7 +18,7 @@
     parser.add_argument("-f", "--outfile", help="Output file to write the CSV.")
 
     args = parser.parse_args()
-    pymisp = ExpandedPyMISP(misp_url, misp_key, misp_verifycert, debug=True)
+    pymisp = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
     attr = []
     if args.attribute:
         attr += args.attribute