mirror of https://github.com/MISP/PyMISP
fix: [perms] Added try/except for various permission conditions, also create the output dir if not exist
fix: [try/except] Catch Ctrl-c keyboard interrupt fix: [style] isort importspull/402/head
parent
16f403e31d
commit
54a2e8657a
|
@ -1,15 +1,15 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import argparse
|
import argparse
|
||||||
import datetime
|
import datetime
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import redis
|
import redis
|
||||||
|
|
||||||
import settings
|
import settings
|
||||||
|
|
||||||
from generator import FeedGenerator
|
from generator import FeedGenerator
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,7 +60,10 @@ class RedisToMISPFeed:
|
||||||
except Exception as error:
|
except Exception as error:
|
||||||
self.save_error_to_redis(error, data)
|
self.save_error_to_redis(error, data)
|
||||||
|
|
||||||
|
try:
|
||||||
beautyful_sleep(5, self.format_last_action())
|
beautyful_sleep(5, self.format_last_action())
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
sys.exit(130)
|
||||||
|
|
||||||
def pop(self, key):
|
def pop(self, key):
|
||||||
popped = self.serv.rpop(key)
|
popped = self.serv.rpop(key)
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
import sys
|
import datetime
|
||||||
|
import hashlib
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import hashlib
|
import sys
|
||||||
import datetime
|
|
||||||
import time
|
import time
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
@ -142,9 +142,24 @@ class FeedGenerator:
|
||||||
|
|
||||||
# Manifest
|
# Manifest
|
||||||
def _init_manifest(self):
|
def _init_manifest(self):
|
||||||
|
# check if outputdir exists and try to create it if not
|
||||||
|
if not os.path.exists(settings.outputdir):
|
||||||
|
try:
|
||||||
|
os.makedirs(settings.outputdir)
|
||||||
|
except PermissionError as error:
|
||||||
|
print(error)
|
||||||
|
print("Please fix the above error and try again.")
|
||||||
|
sys.exit(126)
|
||||||
|
|
||||||
# create an empty manifest
|
# create an empty manifest
|
||||||
|
try:
|
||||||
with open(os.path.join(settings.outputdir, 'manifest.json'), 'w'):
|
with open(os.path.join(settings.outputdir, 'manifest.json'), 'w'):
|
||||||
pass
|
pass
|
||||||
|
except PermissionError as error:
|
||||||
|
print(error)
|
||||||
|
print("Please fix the above error and try again.")
|
||||||
|
sys.exit(126)
|
||||||
|
|
||||||
# create new event and save manifest
|
# create new event and save manifest
|
||||||
self.create_daily_event()
|
self.create_daily_event()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue