Added sensor name/id to db/log

mushorg / glastopf

Web Application Honeypot

http://glastopf.org

558 stars 169 forks source link

Added sensor name/id to db/log #252

Closed nsmfoo closed 9 years ago

nsmfoo commented 9 years ago

As requested in #223

katkad commented 9 years ago

test is failing https://travis-ci.org/mushorg/glastopf/builds/73851379

nsmfoo commented 9 years ago

Could be an issue with the testing files in the testing directory. The helper.py builds a test config which rightfully lack "sensorid" but it also miss other items. Maybe @glaslos can shed some light over this issue?

glaslos commented 9 years ago

Yes, in https://github.com/mushorg/glastopf/blob/master/glastopf/testing/test_honeypot.py#L50 we generate the config. You want to update here: https://github.com/mushorg/glastopf/blob/master/glastopf/testing/helpers.py#L98 We might want to get rid of that and use the glastopf.conf.dist file instead (having only one place to add new configuration settings).

landscape-bot commented 9 years ago

Code quality remained the same when pulling 831b63e on nsmfoo:master into c4d11e4 on mushorg:master.

nsmfoo commented 9 years ago

I did think about setting the "sensorid" to the hostname at first, as that would probably be what people set anyway, but decided against it. But a unique UUID, would work.

landscape-bot commented 9 years ago

Repository health decreased by 0.02% when pulling ef8a524 on nsmfoo:master into c4d11e4 on mushorg:master.

1 new problem was found (including 0 errors and 0 code smells).
No problems were fixed.

glaslos commented 9 years ago

LGTM

katkad commented 9 years ago

LGTM

if you could squash commits into one it would be super-awesome :wink: :wink: :sparkles:

katkad commented 9 years ago

oh, nice, looks good ;)

glaslos commented 9 years ago

@nsmfoo mad git skills!

nsmfoo commented 9 years ago

I have @katkad to thank for the mad skills =)

landscape-bot commented 9 years ago

Code quality remained the same when pulling f2246cf on nsmfoo:master into c4d11e4 on mushorg:master.

katkad commented 9 years ago

working also after squash

@glaslos will you cherry-pick it ?

nsmfoo commented 9 years ago

ping?

glaslos commented 9 years ago

Merged with 412b39574f516361aeadea6b6fc694d45ae1da29 (sorry for the delay)