Commit Graph

110 Commits

Author SHA1 Message Date
Florian Mounier
311e7b9524 Add subject fields 2014-03-21 15:03:41 +01:00
Florian Mounier
4afcc99fe5 Remove issuer check and use unique serial and CA for multiple butterfly CA in broweser 2014-03-20 14:21:49 +01:00
Florian Mounier
a4d59a90f7 Use correct dir for root and bump version 2014-03-20 12:47:37 +01:00
Florian Mounier
74700f5046 Handle secure connection with certificate 2014-03-20 12:14:36 +01:00
Florian Mounier
884eeb169a Implement client/server certificate generation + enable ssl required by default on non localhost hosts 2014-03-19 14:40:36 +01:00
Florian Mounier
515a2c6b46 Bump 1.3.0 2014-03-17 11:49:39 +01:00
Florian Mounier
861c28d056 Don't set ctrl on touch (use 2, 3, 4 multitouch for ctrl, alt, ctrl+alt) 2014-03-17 10:44:14 +01:00
Florian Mounier
ceb50a8a8e Fix #30 2014-03-17 10:43:17 +01:00
Florian Mounier
eb4c84285c Fix hang when butterfly is closed and is running a program. 2014-03-17 10:41:02 +01:00
Florian Mounier
c995d6e277 Let the ctrl+shift+c, ctrl+shift+v go through to handle native copy paste. Fix #36 2014-03-17 10:19:23 +01:00
Florian Mounier
ee545f2002 Add a --more option to log handled exception 2014-03-04 11:14:23 +01:00
Florian Mounier
8e07b75a00 Close on empty read 2014-03-04 11:07:57 +01:00
Florian Mounier
6d4dda0aef Keep the best of both world. 2014-03-04 10:49:43 +01:00
Mounier Florian
3150a116cf Merge pull request #33 from oldgregg/noproc
Completely remove the need for /proc filesytem and iproute2.
2014-03-04 10:17:12 +01:00
OldGregg
2dc13e96f1 Completely remote the need for /proc filesytem and iproute2.
This commit uses lsof, which is available in Linux, OSX,
and other BSD variants. Auto-logins should fail to a
login prompt with this patch when run under cygwin.
2014-03-03 16:26:08 -05:00
Florian Mounier
7e9f5e79f0 I don't even 2014-03-03 19:59:14 +01:00
Florian Mounier
30108a5ff3 Fix uid management and websocket closure before shell exit 2014-03-03 19:44:54 +01:00
Florian Mounier
7d34dc6ba1 Clean up, avoid some server info leak, prevent crash when procfs is unavailable 2014-03-03 18:28:14 +01:00
Florian Mounier
8b66e95006 Restore shift + arrow keys. Fixes #8 2014-03-03 13:01:23 +01:00
Florian Mounier
1b25dce8be Merge branch 'master' of github.com:paradoxxxzero/butterfly 2014-03-02 19:05:03 +01:00
Florian Mounier
713cf483ca Remove automatic code execution from hash fragment. References #16 2014-03-02 19:03:44 +01:00
Mounier Florian
fe11f8a25a Update README.md 2014-03-02 14:11:29 +01:00
Florian Mounier
6b8758dc3e Temporarly remove the raw html escape. Will renable once it's secure. References #14 2014-03-02 13:29:13 +01:00
Florian Mounier
ba1d48fc5f Fix tabs from PR 2014-03-02 11:33:45 +01:00
Mounier Florian
5e03b5340a Merge pull request #18 from oldgregg/master
Added SSL support to butterfly.
2014-03-02 11:08:18 +01:00
OldGregg
1ed9b9eeeb Fixed a typo. Thanks to brushtyler on github. 2014-03-01 16:36:21 -05:00
OldGregg
78cf01c1fd Added SSL support to butterfly.
Added SSL certificate capability to butterfly. Butterfly now
has the --secure option, which requires the following files
to be present in the local folder:
  - butterfly.crt
  - butterfly.key
  - butterflyca.crt
This option forces butterfly to use HTTPS and secure
WebSockets. The connection still requires a username
and password.

There is also the --reallysecure option, which forces
the user's browser to provide a client side certificate.
The certificate is validated against butterflyca.crt, before
allowing the connection. Afterward, the commonName in the
certificate is used as the username for the connection.
The connection still requires the user to provide a password.

Also forced a default user "daemon" to be returned by the
User class, as it prevents someone from finding valid users
on the remote host.
2014-03-01 13:07:04 -05:00
Mounier Florian
4a34543e0b Merge pull request #12 from albertz/patch-1
Update ils
2014-03-01 17:01:19 +01:00
Mounier Florian
470f235815 Merge pull request #11 from pizzapanther/master
Fails with tornado 3.0
2014-03-01 16:58:00 +01:00
Albert Zeyer
6190f93c00 Update ils
fix `except`
2014-03-01 14:08:13 +01:00
Paul Bailey
d79335b032 Require Tornado 3.2 or greater 2014-02-28 22:26:03 -06:00
Paul Bailey
1d7e6323ea Fails with tornado 3.0 2014-02-28 17:53:56 -06:00
Florian Mounier
38cface138 Protect origin, it enhance a little bit security 2014-02-28 18:59:49 +01:00
Florian Mounier
425594d633 Fix CTRL+D unicode error 2014-02-28 18:27:22 +01:00
Florian Mounier
f507ed5be3 Python 2 raw_input compatibility Fixes #2 2014-02-28 18:20:56 +01:00
Florian Mounier
0cbb4b2afc Fix shell name in argv[0] 2014-02-28 12:20:41 +01:00
Florian Mounier
9351fdceec Remove creepy warning at start 2014-02-28 11:46:45 +01:00
Florian Mounier
14caa88d19 Bind to localhost by default 2014-02-28 11:21:47 +01:00
Florian Mounier
3d6677643d Minor fix and fav 2014-02-27 14:58:09 +01:00
Florian Mounier
a5f68cc970 Whoops 2014-02-27 10:09:33 +01:00
Florian Mounier
4dc55630a3 1.1.5 optimize js and css 2014-02-27 10:07:56 +01:00
Florian Mounier
e4d51415ca And the js... 2014-02-26 15:55:21 +01:00
Florian Mounier
779711f077 Fix selection not being unselected on enter 2014-02-26 15:55:02 +01:00
Florian Mounier
89d11c9189 A really better selection 2014-02-24 12:19:01 +01:00
Florian Mounier
459b256ddc Greatly improve selection 2014-02-24 11:06:29 +01:00
Florian Mounier
4aa5f75e4f Bump 2014-02-21 16:53:29 +01:00
Florian Mounier
6d10994eb7 Improve selection 2014-02-21 16:44:46 +01:00
Florian Mounier
1db6c4eb5c Fix path selection 2014-02-17 18:08:49 +01:00
Florian Mounier
cd44280877 Allow to stop history by double ctrl-c. 2014-02-14 17:44:36 +01:00
Florian Mounier
35838a600b Minor fixes 2014-02-14 16:23:32 +01:00