26 Commits
1.0 ... v1.1

Author SHA1 Message Date
amitb
1596f0daee fixed qemu extended keys 2018-10-25 01:53:57 +03:00
amit b
7cecffecf2 added log level 2018-10-20 02:29:36 +03:00
amit b
f57b698430 added logger trace level and set it to write all bytes 2018-10-19 08:13:16 +03:00
amit b
e03c85f7ab added logLevel to cmdline, moved pesky info lines to debug 2018-10-19 07:55:16 +03:00
amit b
931b08376b Merge branch 'master' of https://github.com/amitbet/VncProxy 2018-08-20 23:05:23 +03:00
amit b
2ccc4009f4 added initial support for qemu led state 2018-08-20 23:03:39 +03:00
Amit Bezalel
6e1a343b5f Update README.md 2018-08-17 09:19:47 +03:00
Amit Bezalel
446bc0e537 Merge pull request #2 from wentianle/patch-1
fix vncproxy on windows 2008 rfb proto parse bug
2018-08-11 00:15:54 +03:00
wentianle
a870f3cbb9 fix vncproxy on windows 2008 rfb proto parse bug
Uint8 value range out of bounds causes problems in the parsing protocol
2018-08-10 01:42:52 +08:00
Bezalel
f19a75749b updated build script 2018-08-01 02:02:05 +03:00
Bezalel
02dde77daa fixed: listning only to local server connections 2018-08-01 01:29:39 +03:00
betzalel
b46f708726 logger should not be open in debug 2018-02-12 10:14:54 +02:00
amit bezalel
f298567976 added usage examples to readme 2018-02-10 08:43:40 +02:00
amit bezalel
8543af35a4 advanced the version 2018-02-10 01:53:39 +02:00
amit bezalel
f05c96d449 fixed tight encoding, added the QEMU extended keys message (no way to test it) 2018-02-10 01:41:02 +02:00
amit bezalel
37e11cd72e updated gitignore 2017-10-12 01:24:58 +03:00
amit bezalel
47fefaacb6 added missing target host to cmdline params 2017-10-12 01:21:59 +03:00
betzalel
7852f11ceb starting to create a new file format 2017-08-24 14:33:53 +03:00
betzalel
e06ad806db Merge branch 'master' of https://github.com/amitbet/VncProxy 2017-08-09 11:53:06 +03:00
amit bezalel
9fff2b46aa a better build script 2017-08-06 01:47:14 +03:00
Amit Bezalel
aff3a20d4a Update README.md 2017-08-06 00:52:54 +03:00
Amit Bezalel
6f8d591789 Update README.md 2017-08-06 00:52:17 +03:00
Amit Bezalel
c75e9ccc9c Update README.md 2017-08-06 00:51:20 +03:00
Amit Bezalel
b448d0235a Update README.md 2017-08-06 00:48:08 +03:00
Amit Bezalel
57fdfe914d Update README.md 2017-08-04 23:13:28 -04:00
Amit Bezalel
538037aa8f Update README.md 2017-08-04 23:11:41 -04:00
26 changed files with 300 additions and 70 deletions

5
.gitignore vendored
View File

@@ -2,3 +2,8 @@
*.debug
*.test
debug
/dist
vncproxy
prox
cmd
aa

View File

@@ -1,30 +1,35 @@
# VncProxy
An RFB proxy, written in go that can save and replay FBS files
* supports all modern encodings & most useful pseudo-encodings
* supports multiple VNC client connections & multi servers (chosen by sessionId)
* supports being a "websockify" proxy (for web clients like NoVnc)
* produces FBS files compatible with tightvnc player (while using tight's default 3Byte color format)
* can also be used as:
* a screen recorder vnc-client
* a replay server to show fbs recordings to connecting clients
* Supports all modern encodings & most useful pseudo-encodings
* Supports multiple VNC client connections & multi servers (chosen by sessionId)
* Supports being a "websockify" proxy (for web clients like NoVnc)
* Produces FBS files compatible with tightvnc player (while using tight's default 3Byte color format)
* Can also be used as:
* A screen recorder vnc-client
* A replay server to show fbs recordings to connecting clients
**This is still a work in progress, and requires some error handling and general tidying up,
but the code is already working (see main, proxy_test & player_test)**
- tested on tight encoding with:
- Tested on tight encoding with:
- Tightvnc (client + java client + server)
- FBS player (tightVnc Java player)
- NoVnc(web client)
- NoVnc(web client) => use -wsPort to open a websocket
- ChickenOfTheVnc(client)
- VineVnc(server)
- TigerVnc(client)
## Usage
**Some very usable cmdline executables are Coming Soon...**
Code samples can be found by looking at:
* main.go (fbs recording vnc client)
* Connects, records to FBS file
* Programmed to quit after 10 seconds
### Executables (see releases)
* proxy - the actual recording proxy, supports listening to tcp & ws ports and recording traffic to fbs files
* recorder - connects to a vnc server as a client and records the screen
* player - a toy player that will replay a given fbs file to all incoming connections
## Usage:
recorder -recDir=./recording.rbs -targHost=192.168.0.100 -targPort=5903 -targPass=@@@@@
player -fbsFile=./myrec.fbs -tcpPort=5905
proxy -recDir=./recordings/ -targHost=192.168.0.100 -targPort=5903 -targPass=@@@@@ -tcpPort=5903 -wsPort=5905 -vncPass=@!@!@!
### Code usage examples
* player/main.go (fbs recording vnc client)
   * Connects as client, records to FBS file
* proxy/proxy_test.go (vnc proxy with recording)
* Listens to both Tcp and WS ports
* Proxies connections to a hard-coded localhost vnc server
@@ -56,4 +61,4 @@ The Recorder uses channels and runs in parallel to avoid hampering the communica
![Image of Arch](https://github.com/amitbet/vncproxy/blob/master/architecture/player-arch.png?raw=true)
The code is based on several implementations of go-vnc including the original one by *Mitchell Hashimoto*, and the recentely active fork which belongs to *Vasiliy Tolstov*.
The code is based on several implementations of go-vnc including the original one by *Mitchell Hashimoto*, and the recentely active fork by *Vasiliy Tolstov*.

View File

@@ -1,4 +1,48 @@
export GOOS="darwin"
go build -o ./dist/recorder ./recorder/cmd
go build -o ./dist/player ./player/cmd
go build -o ./dist/proxy ./proxy/cmd
#!/bin/bash
sum="sha1sum"
# VERSION=`date -u +%Y%m%d`
VERSION="v1.02"
LDFLAGS="-X main.VERSION=$VERSION -s -w"
GCFLAGS=""
if ! hash sha1sum 2>/dev/null; then
if ! hash shasum 2>/dev/null; then
echo "I can't see 'sha1sum' or 'shasum'"
echo "Please install one of them!"
exit
fi
sum="shasum"
fi
UPX=false
if hash upx 2>/dev/null; then
UPX=true
fi
OSES=( linux darwin windows )
ARCHS=(amd64 386 )
for os in ${OSES[@]}; do
for arch in ${ARCHS[@]}; do
suffix=""
if [ "$os" == "windows" ]
then
suffix=".exe"
fi
env CGO_ENABLED=0 GOOS=$os GOARCH=$arch go build -ldflags "$LDFLAGS" -gcflags "$GCFLAGS" -o ./dist/${os}_${arch}/recorder${suffix} ./recorder/cmd
env CGO_ENABLED=0 GOOS=$os GOARCH=$arch go build -ldflags "$LDFLAGS" -gcflags "$GCFLAGS" -o ./dist/${os}_${arch}/player${suffix} ./player/cmd
env CGO_ENABLED=0 GOOS=$os GOARCH=$arch go build -ldflags "$LDFLAGS" -gcflags "$GCFLAGS" -o ./dist/${os}_${arch}/proxy${suffix} ./proxy/cmd
if $UPX; then upx -9 client_${os}_${arch}${suffix} server_${os}_${arch}${suffix};fi
# tar -zcf ./dist/vncproxy-${os}-${arch}-$VERSION.tar.gz ./dist/${os}_${arch}/proxy${suffix} ./dist/${os}_${arch}/player${suffix} ./dist/${os}_${arch}/recorder${suffix}
cd dist/${os}_${arch}/
zip -D -q -r ../vncproxy-${os}-${arch}-$VERSION.zip proxy${suffix} player${suffix} recorder${suffix}
cd ../..
$sum ./dist/vncproxy-${os}-${arch}-$VERSION.zip
done
done

View File

@@ -116,9 +116,9 @@ func (c *ClientConn) Read(bytes []byte) (n int, err error) {
return c.conn.Read(bytes)
}
func (c *ClientConn) CurrentColorMap() *common.ColorMap {
return &c.ColorMap
}
// func (c *ClientConn) CurrentColorMap() *common.ColorMap {
// return &c.ColorMap
// }
// CutText tells the server that the client has new text in its cut buffer.
// The text string MUST only contain Latin-1 characters. This encoding
@@ -506,7 +506,7 @@ func (c *ClientConn) mainLoop() {
// Unsupported message type! Bad!
break
}
logger.Infof("ClientConn.MainLoop: got ServerMessage:%s", common.ServerMessageType(messageType))
logger.Debugf("ClientConn.MainLoop: got ServerMessage:%s", common.ServerMessageType(messageType))
reader.SendMessageStart(common.ServerMessageType(messageType))
reader.PublishBytes([]byte{byte(messageType)})

View File

@@ -63,7 +63,7 @@ func (fbm *MsgFramebufferUpdate) Read(c common.IClientConn, r *common.RfbReadHel
// We must always support the raw encoding
rawEnc := new(encodings.RawEncoding)
encMap[rawEnc.Type()] = rawEnc
logger.Infof("MsgFramebufferUpdate.Read: numrects= %d", numRects)
logger.Debugf("MsgFramebufferUpdate.Read: numrects= %d", numRects)
rects := make([]common.Rectangle, numRects)
for i := uint16(0); i < numRects; i++ {
@@ -90,7 +90,7 @@ func (fbm *MsgFramebufferUpdate) Read(c common.IClientConn, r *common.RfbReadHel
encType := common.EncodingType(encodingTypeInt)
logger.Infof("MsgFramebufferUpdate.Read: rect# %d, rect hdr data: enctype=%s, data: %s", i, encType, string(jBytes))
logger.Debugf("MsgFramebufferUpdate.Read: rect# %d, rect hdr data: enctype=%s, data: %s", i, encType, string(jBytes))
enc, supported := encMap[encodingTypeInt]
if supported {
var err error
@@ -175,9 +175,9 @@ func (m *MsgSetColorMapEntries) Read(c common.IClientConn, r *common.RfbReadHelp
return nil, err
}
}
cmap := c.CurrentColorMap()
// Update the connection's color map
cmap[result.FirstColor+i] = *color
// cmap := c.CurrentColorMap()
// // Update the connection's color map
// cmap[result.FirstColor+i] = *color
}
r.SendMessageEnd(common.ServerMessageType(m.Type()))
return &result, nil

View File

@@ -18,6 +18,7 @@ const (
PointerEventMsgType
ClientCutTextMsgType
ClientFenceMsgType = 248
QEMUExtendedKeyEventMsgType = 255
)
// Color represents a single color in a color map.
@@ -47,6 +48,8 @@ func (cmt ClientMessageType) String() string {
return "FramebufferUpdateRequest"
case KeyEventMsgType:
return "KeyEvent"
case QEMUExtendedKeyEventMsgType:
return "QEMUExtendedKeyEvent"
case PointerEventMsgType:
return "PointerEvent"
case ClientCutTextMsgType:

View File

@@ -25,6 +25,6 @@ type IServerConn interface {
type IClientConn interface {
CurrentPixelFormat() *PixelFormat
CurrentColorMap() *ColorMap
//CurrentColorMap() *ColorMap
Encodings() []IEncoding
}

View File

@@ -73,6 +73,8 @@ func (enct EncodingType) String() string {
return "EncJPEGQualityLevelPseudo1"
case EncCursorPseudo:
return "EncCursorPseudo"
case EncLedStatePseudo:
return "EncLedStatePseudo"
case EncDesktopSizePseudo:
return "EncDesktopSizePseudo"
case EncLastRectPseudo:
@@ -183,6 +185,7 @@ const (
EncQEMUPointerMotionChangePseudo EncodingType = -257
EncQEMUExtendedKeyEventPseudo EncodingType = -258
EncTightPng EncodingType = -260
EncLedStatePseudo EncodingType = -261
EncExtendedDesktopSizePseudo EncodingType = -308
EncXvpPseudo EncodingType = -309
EncFencePseudo EncodingType = -312

View File

@@ -0,0 +1,31 @@
package encodings
import (
"io"
"vncproxy/common"
"vncproxy/logger"
)
type EncLedStatePseudo struct {
LedState uint8
}
func (pe *EncLedStatePseudo) Type() int32 {
return int32(common.EncLedStatePseudo)
}
func (pe *EncLedStatePseudo) WriteTo(w io.Writer) (n int, err error) {
w.Write([]byte{pe.LedState})
return 1, nil
}
func (pe *EncLedStatePseudo) Read(pf *common.PixelFormat, rect *common.Rectangle, r *common.RfbReadHelper) (common.IEncoding, error) {
if rect.Width*rect.Height == 0 {
return pe, nil
}
u8, err := r.ReadUint8()
pe.LedState = u8
if err != nil {
logger.Error("error while reading led state: ", err)
return pe, err
}
return pe, nil
}

View File

@@ -142,7 +142,7 @@ func handleTightFilters(subencoding uint8, pixelFmt *common.PixelFormat, rect *c
return
}
paletteSize := colorCount + 1 // add one more
paletteSize := int(colorCount) + 1 // add one more
logger.Debugf("handleTightFilters: ----PALETTE_FILTER: paletteSize=%d bytesPixel=%d\n", paletteSize, bytesPixel)
//complete palette
_, err = r.ReadBytes(int(paletteSize) * bytesPixel)
@@ -155,7 +155,7 @@ func handleTightFilters(subencoding uint8, pixelFmt *common.PixelFormat, rect *c
if paletteSize == 2 {
dataLength = int(rect.Height) * ((int(rect.Width) + 7) / 8)
} else {
dataLength = int(rect.Width * rect.Height)
dataLength = int(rect.Width) * int(rect.Height)
}
_, err = r.ReadTightData(dataLength)
if err != nil {

View File

@@ -4,6 +4,30 @@ import "fmt"
var simpleLogger = SimpleLogger{LogLevelInfo}
func SetLogLevel(logLevel string) {
level := GetLogLevel(logLevel)
fmt.Println("Log level set to: ", logLevel)
simpleLogger = SimpleLogger{level}
}
func GetLogLevel(logLevel string) LogLevel {
switch logLevel {
case "trace":
return LogLevelTrace
case "debug":
return LogLevelDebug
case "info":
return LogLevelInfo
case "warn":
return LogLevelWarn
case "error":
return LogLevelError
case "fatal":
return LogLevelFatal
}
return LogLevelInfo
}
type Logger interface {
Debug(v ...interface{})
Debugf(format string, v ...interface{})
@@ -127,6 +151,13 @@ func Debugf(format string, v ...interface{}) {
simpleLogger.Debugf(format, v...)
}
func Trace(v ...interface{}) {
simpleLogger.Trace(v...)
}
func Tracef(format string, v ...interface{}) {
simpleLogger.Tracef(format, v...)
}
func Info(v ...interface{}) {
simpleLogger.Info(v...)
}

View File

@@ -15,8 +15,10 @@ func main() {
wsPort := flag.String("wsPort", "", "websocket port for player to listen to client connections")
tcpPort := flag.String("tcpPort", "", "tcp port for player to listen to client connections")
fbsFile := flag.String("fbsFile", "", "fbs file to serve to all connecting clients")
logLevel := flag.String("logLevel", "info", "change logging level")
flag.Parse()
logger.SetLogLevel(*logLevel)
fmt.Println("**************************************************************************")
fmt.Println("*** This is a toy server that replays a single FBS file to all clients ***")
@@ -80,7 +82,7 @@ func main() {
os.Exit(1)
}
url := "http://localhost:" + *wsPort + "/"
url := "http://0.0.0.0:" + *wsPort + "/"
if *tcpPort != "" && *wsPort != "" {
logger.Infof("running two listeners: tcp port: %s, ws url: %s", *tcpPort, url)

View File

@@ -3,17 +3,25 @@ package player
import (
"encoding/binary"
"io"
"time"
"vncproxy/client"
"vncproxy/common"
"vncproxy/logger"
"vncproxy/server"
)
type VncStreamFileReader interface {
io.Reader
CurrentTimestamp() int
ReadStartSession() (*common.ServerInit, error)
CurrentPixelFormat() *common.PixelFormat
Encodings() []common.IEncoding
}
type FBSPlayListener struct {
Conn *server.ServerConn
Fbs *FbsReader
Fbs VncStreamFileReader
serverMessageMap map[uint8]common.ServerMessage
firstSegDone bool
startTime int
@@ -88,7 +96,7 @@ func (h *FBSPlayListener) sendFbsMessage() {
return
}
timeSinceStart := int(time.Now().UnixNano()/int64(time.Millisecond)) - h.startTime
timeToSleep := fbs.currentTimestamp - timeSinceStart
timeToSleep := fbs.CurrentTimestamp() - timeSinceStart
if timeToSleep > 0 {
time.Sleep(time.Duration(timeToSleep) * time.Millisecond)
}

View File

@@ -18,6 +18,10 @@ type FbsReader struct {
encodings []common.IEncoding
}
func (fbs *FbsReader) CurrentTimestamp() int {
return fbs.currentTimestamp
}
func (fbs *FbsReader) Read(p []byte) (n int, err error) {
if fbs.buffer.Len() < len(p) {
seg, err := fbs.ReadSegment()
@@ -33,7 +37,8 @@ func (fbs *FbsReader) Read(p []byte) (n int, err error) {
}
func (fbs *FbsReader) CurrentPixelFormat() *common.PixelFormat { return fbs.pixelFormat }
func (fbs *FbsReader) CurrentColorMap() *common.ColorMap { return &common.ColorMap{} }
//func (fbs *FbsReader) CurrentColorMap() *common.ColorMap { return &common.ColorMap{} }
func (fbs *FbsReader) Encodings() []common.IEncoding { return fbs.encodings }
func NewFbsReader(fbsFile string) (*FbsReader, error) {
@@ -53,6 +58,7 @@ func NewFbsReader(fbsFile string) (*FbsReader, error) {
&encodings.TightEncoding{},
&encodings.TightPngEncoding{},
&encodings.EncCursorPseudo{},
&encodings.EncLedStatePseudo{},
&encodings.RawEncoding{},
&encodings.RREEncoding{},
},

View File

@@ -18,6 +18,7 @@ func TestServer(t *testing.T) {
&encodings.RawEncoding{},
&encodings.TightEncoding{},
&encodings.EncCursorPseudo{},
&encodings.EncLedStatePseudo{},
//encodings.TightPngEncoding{},
&encodings.RREEncoding{},
&encodings.ZLibEncoding{},

View File

@@ -12,9 +12,12 @@ func main() {
var vncPass = flag.String("vncPass", "", "password on incoming vnc connections to the proxy, defaults to no password")
var recordDir = flag.String("recDir", "", "path to save FBS recordings WILL NOT RECORD if not defined.")
var targetVncPort = flag.String("targPort", "", "target vnc server port")
var targetVncHost = flag.String("targHost", "", "target vnc server host")
var targetVncPass = flag.String("targPass", "", "target vnc password")
var logLevel = flag.String("logLevel", "info", "change logging level")
flag.Parse()
logger.SetLogLevel(*logLevel)
if *tcpPort == "" && *wsPort == "" {
logger.Error("no listening port defined")
@@ -35,13 +38,18 @@ func main() {
logger.Warn("FBS recording is turned off")
}
tcpUrl := ""
if *tcpPort != "" {
tcpUrl = ":" + string(*tcpPort)
}
proxy := &proxy.VncProxy{
WsListeningUrl: "http://localhost:" + string(*wsPort) + "/", // empty = not listening on ws
WsListeningUrl: "http://0.0.0.0:" + string(*wsPort) + "/", // empty = not listening on ws
RecordingDir: *recordDir, //"/Users/amitbet/vncRec", // empty = no recording
TcpListeningUrl: ":" + string(*tcpPort),
TcpListeningUrl: tcpUrl,
ProxyVncPassword: *vncPass, //empty = no auth
SingleSession: &proxy.VncSession{
TargetHostname: "localhost",
TargetHostname: *targetVncHost,
TargetPort: *targetVncPort,
TargetPassword: *targetVncPass, //"vncPass",
ID: "dummySession",

View File

@@ -13,7 +13,7 @@ type ClientUpdater struct {
// Consume recieves vnc-server-bound messages (Client messages) and updates the server part of the proxy
func (cc *ClientUpdater) Consume(seg *common.RfbSegment) error {
//logger.Debugf("ClientUpdater.Consume (vnc-server-bound): got segment type=%s bytes: %v", seg.SegmentType, seg.Bytes)
logger.Tracef("ClientUpdater.Consume (vnc-server-bound): got segment type=%s bytes: %v", seg.SegmentType, seg.Bytes)
switch seg.SegmentType {
case common.SegmentFullyParsedClientMessage:

View File

@@ -62,7 +62,7 @@ func (vp *VncProxy) getProxySession(sessionId string) (*VncSession, error) {
}
func (vp *VncProxy) newServerConnHandler(cfg *server.ServerConfig, sconn *server.ServerConn) error {
var err error
session, err := vp.getProxySession(sconn.SessionId)
if err != nil {
logger.Errorf("Proxy.newServerConnHandler can't get session: %d", sconn.SessionId)
@@ -70,10 +70,11 @@ func (vp *VncProxy) newServerConnHandler(cfg *server.ServerConfig, sconn *server
}
var rec *listeners.Recorder
if session.Type == SessionTypeRecordingProxy {
recFile := "recording" + strconv.FormatInt(time.Now().Unix(), 10) + ".rbs"
recPath := path.Join(vp.RecordingDir, recFile)
rec, err := listeners.NewRecorder(recPath)
rec, err = listeners.NewRecorder(recPath)
if err != nil {
logger.Errorf("Proxy.newServerConnHandler can't open recorder save path: %s", recPath)
return err
@@ -117,6 +118,7 @@ func (vp *VncProxy) newServerConnHandler(cfg *server.ServerConfig, sconn *server
&encodings.RawEncoding{},
&encodings.TightEncoding{},
&encodings.EncCursorPseudo{},
&encodings.EncLedStatePseudo{},
&encodings.TightPngEncoding{},
&encodings.RREEncoding{},
&encodings.ZLibEncoding{},
@@ -173,7 +175,7 @@ func (vp *VncProxy) StartListening() {
logger.Infof("running two listeners: tcp port: %s, ws url: %s", vp.TcpListeningUrl, vp.WsListeningUrl)
go server.WsServe(vp.WsListeningUrl, cfg)
server.TcpServe(":"+vp.TcpListeningUrl, cfg)
server.TcpServe(vp.TcpListeningUrl, cfg)
}
if vp.WsListeningUrl != "" {

View File

@@ -6,15 +6,15 @@ func TestProxy(t *testing.T) {
//create default session if required
proxy := &VncProxy{
WsListeningUrl: "http://localhost:7777/", // empty = not listening on ws
RecordingDir: "/Users/amitbet/vncRec", // empty = no recording
WsListeningUrl: "http://0.0.0.0:7778/", // empty = not listening on ws
RecordingDir: "d:\\", // empty = no recording
TcpListeningUrl: ":5904",
//recordingDir: "C:\\vncRec", // empty = no recording
//RecordingDir: "C:\\vncRec", // empty = no recording
ProxyVncPassword: "1234", //empty = no auth
SingleSession: &VncSession{
TargetHostname: "localhost",
TargetPort: "5903",
TargetPassword: "Ch_#!T@8",
TargetHostname: "192.168.1.101",
TargetPort: "5901",
TargetPassword: "123456",
ID: "dummySession",
Status: SessionStatusInit,
Type: SessionTypeRecordingProxy,

View File

@@ -16,11 +16,20 @@ func main() {
// var tcpPort = flag.String("tcpPort", "", "tcp port")
// var wsPort = flag.String("wsPort", "", "websocket port")
// var vncPass = flag.String("vncPass", "", "password on incoming vnc connections to the proxy, defaults to no password")
var recordDir = flag.String("recDir", "", "path to save FBS recordings WILL NOT RECORD IF EMPTY.")
var recordDir = flag.String("recFile", "", "FBS file to create, recordings WILL NOT RECORD IF EMPTY.")
var targetVncPort = flag.String("targPort", "", "target vnc server port")
var targetVncPass = flag.String("targPass", "", "target vnc password")
var targetVncHost = flag.String("targHost", "localhost", "target vnc hostname")
var logLevel = flag.String("logLevel", "info", "change logging level")
flag.Parse()
logger.SetLogLevel(*logLevel)
if *targetVncHost == "" {
logger.Error("no target vnc server host defined")
flag.Usage()
os.Exit(1)
}
if *targetVncPort == "" {
logger.Error("no target vnc server port defined")
@@ -33,10 +42,12 @@ func main() {
}
if *recordDir == "" {
logger.Warn("FBS recording is turned off")
} else {
logger.Infof("Recording rfb stream into file: '%s'", *recordDir)
}
//nc, err := net.Dial("tcp", "192.168.1.101:5903")
nc, err := net.Dial("tcp", "localhost:"+*targetVncPort)
nc, err := net.Dial("tcp", *targetVncHost+":"+*targetVncPort)
if err != nil {
logger.Errorf("error connecting to vnc server: %s", err)
@@ -74,9 +85,9 @@ func main() {
encs := []common.IEncoding{
&encodings.TightEncoding{},
//&encodings.TightPngEncoding{},
//rre := encodings.RREEncoding{},
//zlib := encodings.ZLibEncoding{},
//zrle := encodings.ZRLEEncoding{},
//&encodings.RREEncoding{},
//&encodings.ZLibEncoding{},
//&encodings.ZRLEEncoding{},
//&encodings.CopyRectEncoding{},
//coRRE := encodings.CoRREEncoding{},
//hextile := encodings.HextileEncoding{},

View File

@@ -38,7 +38,7 @@ func NewRecorder(saveFilePath string) (*Recorder, error) {
rec.maxWriteSize = 65535
rec.writer, err = os.OpenFile(saveFilePath, os.O_RDWR|os.O_CREATE, 0755)
rec.writer, err = os.OpenFile(saveFilePath, os.O_RDWR|os.O_CREATE, 0644)
if err != nil {
logger.Errorf("unable to open file: %s, error: %v", saveFilePath, err)
return nil, err

View File

@@ -165,6 +165,36 @@ func (msg *MsgKeyEvent) Write(c io.Writer) error {
return nil
}
// MsgKeyEvent holds the wire format message.
type MsgQEMUExtKeyEvent struct {
SubmessageType uint8 // submessage type
DownFlag uint16 // down-flag
KeySym Key // key symbol
KeyCode uint32 // scan code
}
func (*MsgQEMUExtKeyEvent) Type() common.ClientMessageType {
return common.QEMUExtendedKeyEventMsgType
}
func (*MsgQEMUExtKeyEvent) Read(c io.Reader) (common.ClientMessage, error) {
msg := MsgKeyEvent{}
if err := binary.Read(c, binary.BigEndian, &msg); err != nil {
return nil, err
}
return &msg, nil
}
func (msg *MsgQEMUExtKeyEvent) Write(c io.Writer) error {
if err := binary.Write(c, binary.BigEndian, msg.Type()); err != nil {
return err
}
if err := binary.Write(c, binary.BigEndian, msg); err != nil {
return err
}
return nil
}
// PointerEventMessage holds the wire format message.
type MsgPointerEvent struct {
Mask uint8 // button-mask
@@ -280,3 +310,34 @@ func (msg *MsgClientCutText) Write(c io.Writer) error {
return nil
}
// MsgClientQemuExtendedKey holds the wire format message, for qemu keys
type MsgClientQemuExtendedKey struct {
SubType uint8 // sub type
IsDown uint16 // button down indicator
KeySym uint32 // key symbol
KeyCode uint32 // key code
}
func (*MsgClientQemuExtendedKey) Type() common.ClientMessageType {
return common.QEMUExtendedKeyEventMsgType
}
func (*MsgClientQemuExtendedKey) Read(c io.Reader) (common.ClientMessage, error) {
msg := MsgClientQemuExtendedKey{}
if err := binary.Read(c, binary.BigEndian, &msg); err != nil {
return nil, err
}
return &msg, nil
}
func (msg *MsgClientQemuExtendedKey) Write(c io.Writer) error {
if err := binary.Write(c, binary.BigEndian, msg.Type()); err != nil {
return err
}
if err := binary.Write(c, binary.BigEndian, msg); err != nil {
return err
}
return nil
}

View File

@@ -95,7 +95,7 @@ func ServerSecurityHandler(cfg *ServerConfig, c *ServerConn) error {
sType, ok := secTypes[secType]
if !ok {
return fmt.Errorf("server type %d not implemented")
return fmt.Errorf("server type %d not implemented", secType)
}
var authCode uint32
@@ -135,7 +135,7 @@ func ServerServerInitHandler(cfg *ServerConfig, c *ServerConn) error {
NameLength: uint32(len(cfg.DesktopName)),
NameText: []byte(cfg.DesktopName),
}
logger.Infof("Server.ServerServerInitHandler initMessage: %v", srvInit)
logger.Debugf("Server.ServerServerInitHandler initMessage: %v", srvInit)
if err := binary.Write(c, binary.BigEndian, srvInit.FBWidth); err != nil {
return err
}

View File

@@ -168,16 +168,17 @@ func (c *ServerConn) handle() error {
default:
var messageType common.ClientMessageType
if err := binary.Read(c, binary.BigEndian, &messageType); err != nil {
logger.Errorf("IServerConn.handle error: %v", err)
logger.Errorf("ServerConn.handle error: %v", err)
return err
}
logger.Debugf("ServerConn.handle: got messagetype, %d", messageType)
msg, ok := clientMessages[messageType]
logger.Debugf("ServerConn.handle: found message type, %v", ok)
if !ok {
return fmt.Errorf("IServerConn.Handle: unsupported message-type: %v", messageType)
logger.Errorf("ServerConn.handle: unsupported message-type: %v", messageType)
}
parsedMsg, err := msg.Read(c)
logger.Debugf("ServerConn.handle: got parsed messagetype, %v", parsedMsg)
//update connection for pixel format / color map changes
switch parsedMsg.Type() {
case common.SetPixelFormatMsgType:
@@ -196,7 +197,7 @@ func (c *ServerConn) handle() error {
return err
}
logger.Infof("IServerConn.Handle got ClientMessage: %s, %v", parsedMsg.Type(), parsedMsg)
logger.Debugf("IServerConn.Handle got ClientMessage: %s, %v", parsedMsg.Type(), parsedMsg)
//TODO: treat set encodings by allowing only supported encoding in proxy configurations
//// if parsedMsg.Type() == common.SetEncodingsMsgType{
//// c.cfg.Encodings

View File

@@ -15,6 +15,7 @@ var DefaultClientMessages = []common.ClientMessage{
&MsgKeyEvent{},
&MsgPointerEvent{},
&MsgClientCutText{},
&MsgClientQemuExtendedKey{},
}
// FramebufferUpdate holds a FramebufferUpdate wire format message.

View File

@@ -7,3 +7,10 @@
* move encodings to be on the framebufferupdate message object
* clear all messages read functions from updating stuff, move modification logic to another listener
* message read function should accept only an io.Reader, move read helper logic (readuint8) to an actual helper class
* new recording format:
* rfb extension
* save FBResponse messages with additional fields
* timestamp
* is incremental
* size (bytes)
* have a header which contains an index of messages, holding timestamps & file positions for seeking