Michel Oosterhof
5a885c4f00
Merge branch 'master' of https://github.com/micheloosterhof/kippo into logging-2
...
Conflicts:
kippo/core/auth.py
kippo/core/dblog.py
kippo/core/ssh.py
kippo/dblog/jsonlog.py
2015-02-19 12:36:26 +00:00
Michel Oosterhof
687870c45c
use relative style imports instead of absolute paths
2015-02-19 12:01:07 +00:00
Michel Oosterhof
e12b76b206
formatted log messages. not completely working yet withdispach
2015-02-03 16:18:26 +00:00
Michel Oosterhof
27321853ec
all messages migrated to new formated messages
2015-02-03 11:04:56 +00:00
Michel Oosterhof
d5e8965b1a
commands retrieve environment variables from honeypotshell
...
add which command
2015-02-03 06:40:51 +00:00
Michel Oosterhof
e9e09f949e
ignore shell commands start with #
2015-01-03 19:19:46 +04:00
Michel Oosterhof
a3f3866f9e
remove unused imports
2014-12-07 17:56:38 +00:00
Michel Oosterhof
f480b985d3
cosmetic changes to imports
2014-11-11 21:27:06 +04:00
Michel Oosterhof
0fa0825231
rename 'honeypot' parameter to 'protocol', the conch term
2014-11-11 21:21:18 +04:00
Michel Oosterhof
d3bfeca331
fix copy imports
2014-11-09 17:33:29 +04:00
Michel Oosterhof
ad91243658
move fscopy out of sftp/protocol into avatar. rename user to avatar
2014-11-09 17:28:06 +04:00
Michel Oosterhof
7aa3505adc
we need the full re.split for the field limitation
2014-11-02 08:51:52 +00:00
Michel Oosterhof
091197d92a
split on && and newline
2014-10-31 11:59:23 +00:00
Michel Oosterhof
c4efff1283
add imports for logging, disable logging from fs.py
2014-10-05 21:02:24 +00:00
Michel Oosterhof
4ace22db76
convert all 'print' calls to 'log.msg'
2014-10-05 20:54:14 +00:00
Upi Tamminen
b321ef1098
quick fixes:
...
- txtcmd broken since HoneyPotCommand wasn't found (fixes #147 )
- tab completion broken since os wasn't imported
2014-08-13 08:19:51 +03:00
Upi Tamminen
c3c09adb02
restructuring and cleanup
2014-08-09 23:55:20 +03:00
Upi Tamminen
6c8596930e
change exec handling so the command is allowed to run long enough for wget to
...
work
2014-08-09 19:19:05 +03:00
Upi Tamminen
e1e3acb850
we don't need recvline.HistoricRecvLine for execCommand,
...
so branch off the protocol into two protocols
2014-08-09 18:29:17 +03:00
Upi Tamminen
641c08cf7c
code style changes
2014-08-09 15:48:33 +03:00
Upi Tamminen
4e8ad9c92c
Merge branch 'pr/111' into review-pr-111
...
Conflicts:
kippo.cfg.dist
kippo/core/honeypot.py
2014-08-09 15:37:58 +03:00
Upi Tamminen
14fd2fec32
cleanup key generation
2014-08-09 15:20:10 +03:00
Upi Tamminen
6e6a8aa4c1
[i] does not generally mean anything in kippo
2014-08-09 15:01:58 +03:00
Upi Tamminen
baeda78839
Merge branch 'pr/108' into review-pr-108
2014-08-09 15:00:38 +03:00
desaster
acbb5dbb3c
Merge pull request #96 from g0tmi1k/protocolmismatch
...
Fix "protocol mismatch" issue
2014-08-09 13:52:13 +03:00
Upi Tamminen
e4d4ea4b2e
Merge branch 'bash' of https://github.com/g0tmi1k/kippo into g0tmi1k-bash
2014-06-13 18:07:41 +03:00
g0tmi1k
7791dd2821
Updated some bash error output
2014-06-01 14:27:51 +01:00
g0tmi1k
5b3482b356
Changed default hostname
...
...You may wish to alter this again (decrease chance of detection)
2014-06-01 14:16:48 +01:00
g0tmi1k
52d3984755
Added "execCommand" support
...
Credit: https://github.com/micheloosterhof/kippo/
2014-06-01 11:30:26 +01:00
g0tmi1k
2e0c2cd4d0
Add DSA support, move location & increase key size
...
Credit: https://github.com/micheloosterhof/kippo/
Add DSA SSH key support
Move from: “./public.key” to “./data/ssh_host_rsa_key.pub“
Increase key size from 1024 to 2048 bits
2014-05-30 05:19:23 +01:00
g0tmi1k
19d3fa1349
Updated "shell prompt" (to give a Debian feel)
...
Looks more like Debian/Ubuntu (which is the default base OS).
Check comments for CentOS version.
2014-05-29 08:38:43 +01:00
g0tmi1k
40b65278c3
Fix "protocol mismatch" issue
...
Credit: http://kbyte.snowpenguin.org/portal/2013/04/30/kippo-protocol-mismatch-workaround/
2014-05-28 19:06:19 +01:00
g0tmi1k
9737a8fdb6
Fixed formatting issues
2014-05-28 05:26:13 +01:00
g0tmi1k
74d5cb0825
Removed all trailing spaces
2014-05-28 05:13:55 +01:00
desaster
5359da0ab7
limit shell input a bit
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@248 951d7100-d841-11de-b865-b3884708a8e2
2014-05-18 16:53:32 +00:00
desaster@gmail.com
42585c44c9
Make ourVersionString configurable (Resolves issue #54 )
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@247 951d7100-d841-11de-b865-b3884708a8e2
2014-02-16 09:50:41 +00:00
desaster
248dd56ed7
fix twisted version comparision for premature key exchange fix
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@234 951d7100-d841-11de-b865-b3884708a8e2
2013-02-04 17:10:09 +00:00
desaster
8e9fe0605c
Workaround so the premature key exchange workaround works on twisted >= 11
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@233 951d7100-d841-11de-b865-b3884708a8e2
2013-02-04 11:44:42 +00:00
desaster
3912ffb603
Remove connection limit support for now, since adding a protocol wrapper
...
changes the logging in newer twisted versions, and breaks dblog.
git-svn-id: https://kippo.googlecode.com/svn/trunk@232 951d7100-d841-11de-b865-b3884708a8e2
2013-01-21 12:41:41 +00:00
desaster
9378c6ba22
Limit total number of concurrent connections. Configurable with
...
connection_limit (default 50).
Also fix logging downloads.
git-svn-id: https://kippo.googlecode.com/svn/trunk@229 951d7100-d841-11de-b865-b3884708a8e2
2013-01-08 21:40:19 +00:00
desaster
bff1829e3c
further fixing on issue 55 - do not set the initial cwd if the path doesn't exist
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@226 951d7100-d841-11de-b865-b3884708a8e2
2013-01-08 17:52:21 +00:00
desaster
b53e8a65d1
Don't send key exchange prematurely
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@220 951d7100-d841-11de-b865-b3884708a8e2
2012-07-08 16:30:32 +00:00
desaster
0eaf51c48e
Update the uptime command to display real uptime of the honeypot, and zero
...
load. This closes issue #47
Also added a small change to ps output.
git-svn-id: https://kippo.googlecode.com/svn/trunk@217 951d7100-d841-11de-b865-b3884708a8e2
2012-04-08 16:41:34 +00:00
desaster
ace3015574
experiment: print out passed environment variables to the log
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@216 951d7100-d841-11de-b865-b3884708a8e2
2012-03-27 07:05:28 +00:00
desaster
69b20c2282
Don't send banner if the banner file is not found (thanks mark)
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@215 951d7100-d841-11de-b865-b3884708a8e2
2012-03-03 05:15:08 +00:00
desaster
8b336fbb96
don't delete a session from the sessions dict if it's not there
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@213 951d7100-d841-11de-b865-b3884708a8e2
2011-10-23 16:40:49 +00:00
desaster
8845b2b0eb
Fixes and restructuring for the session management code, as well as
...
disconnect handling in general
git-svn-id: https://kippo.googlecode.com/svn/trunk@212 951d7100-d841-11de-b865-b3884708a8e2
2011-10-23 12:27:01 +00:00
desaster
f2488b4173
* Write input from the session manager to ttylog with a different ID
...
* playlog.py now able to colorify the output based on which streams the input
is coming form
git-svn-id: https://kippo.googlecode.com/svn/trunk@211 951d7100-d841-11de-b865-b3884708a8e2
2011-10-21 18:35:41 +00:00
desaster
f8429dfd0f
Added a telnet based session management interface for interacting with active
...
sessions
git-svn-id: https://kippo.googlecode.com/svn/trunk@209 951d7100-d841-11de-b865-b3884708a8e2
2011-10-21 09:29:06 +00:00
desaster
796dc1babb
Typing ".." in shell raises an exception ( Fixes #40 )
...
git-svn-id: https://kippo.googlecode.com/svn/trunk@207 951d7100-d841-11de-b865-b3884708a8e2
2011-04-29 12:27:55 +00:00