Skip to content

Backslash #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aabed wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Backslash #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c331f8
Jasonfies the payload to avoid backslashes
aabed Feb 1, 2015
c41f21c
Removes json.loads as it's already has been added to mnemodb.py
aabed Feb 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion normalizer/modules/kippo_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class KippoEvents(BaseNormalizer):
channels = ('kippo.sessions',)

def normalize(self, data, channel, submission_timestamp, ignore_rfc1918=True):
o_data = json.loads(data)
o_data = data

if ignore_rfc1918 and self.is_RFC1918_addr(o_data['peerIP']):
return []
Expand Down
3 changes: 2 additions & 1 deletion persistance/mnemodb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import logging
import string
import time
import json
from datetime import datetime

from pymongo import MongoClient
Expand Down Expand Up @@ -112,7 +113,7 @@ def insert_hpfeed(self, ident, channel, payload):
payload = str(payload).encode('hex')
else:
payload = str(payload)

payload = json.loads(payload)
timestamp = datetime.utcnow()
entry = {'channel': channel,
'ident': ident,
Expand Down