Skip to content

Commit 402af1a

Browse files
committed
fix tcpusb reverse ok bug
1 parent a2ceff9 commit 402af1a

5 files changed

Lines changed: 92 additions & 49 deletions

File tree

‎adb/device.go‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import (
66
"io/ioutil"
77
"net"
88
"os"
9+
"regexp"
10+
"strings"
911
"time"
1012

1113
shellquote "github.com/kballard/go-shellquote"
@@ -146,6 +148,21 @@ func (p PropValue) Bool() bool {
146148
return p == "true"
147149
}
148150

151+
var propertyRE = regexp.MustCompile(`\[(.+)\]: \[(.+)\]`)
152+
149153
func (ad *Device) Properties() (props map[string]PropValue, err error) {
154+
props = make(map[string]PropValue)
155+
output, err := ad.RunCommand("getprop")
156+
if err != nil {
157+
return
158+
}
159+
for _, line := range strings.Split(output, "\n") {
160+
parts := propertyRE.FindStringSubmatch(line)
161+
if len(parts) != 3 {
162+
continue
163+
}
164+
key, val := parts[1], parts[2]
165+
props[key] = PropValue(val)
166+
}
150167
return
151168
}

‎adb/device_test.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package adb
2+
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/assert"
7+
)
8+
9+
func TestDeviceProperties(t *testing.T) {
10+
device := NewClient("").Device(AnyDevice())
11+
props, err := device.Properties()
12+
if assert.NoError(t, err) {
13+
t.Log(props["ro.product.name"])
14+
}
15+
}

‎adb/tcpusb.go‎

Lines changed: 53 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,13 @@ func (s *Session) Serve() {
8181
s.onAuth(pkt)
8282
case _OPEN:
8383
s.onOpen(pkt)
84-
case _OKAY, _WRTE, _CLSE:
84+
case _OKAY, _WRTE:
8585
s.forwardServicePacket(pkt)
86+
case _CLSE:
87+
s.forwardServicePacket(pkt)
88+
s.mu.Lock()
89+
delete(s.services, pkt.Arg1)
90+
s.mu.Unlock()
8691
default:
8792
s.err = errors.New("unknown cmd: " + pkt.Command)
8893
}
@@ -105,18 +110,22 @@ func (sess *Session) onConnection(pkt Packet) {
105110
sess.maxPayload = maxPayload
106111
// log.Println("MaxPayload:", maxPayload)
107112
sess.err = sess.writePacket(_AUTH, AUTH_TOKEN, 0, sess.token)
108-
pkt.DumpToStdout()
113+
// pkt.DumpToStdout()
109114
}
110115

111116
func (sess *Session) authVerified() {
112117
version := swapUint32(1)
113118
// FIXME(ssx): need device.Properties()
114-
connProps := []string{
115-
"ro.product.name=2014011",
116-
"ro.product.model=2014011",
117-
"ro.product.device=HM2014011",
119+
props, _ := sess.device.Properties()
120+
connProps := make([]string, 0, 3)
121+
for _, propName := range []string{
122+
"ro.product.name",
123+
"ro.product.model",
124+
"ro.product.device",
125+
} {
126+
connProps = append(connProps, fmt.Sprintf("%s=%s", propName, props[propName]))
118127
}
119-
// connProps = append(connProps, "features=cmd,stat_v2,shell_v2")
128+
// connProps = append(connProps, "features=cmd") //,stat_v2,shell_v2")
120129
deviceBanner := "device"
121130
payload := fmt.Sprintf("%s::%s", deviceBanner, strings.Join(connProps, ";"))
122131
// id := "device::;;\x00"
@@ -167,51 +176,26 @@ func (sess *Session) onOpen(pkt Packet) {
167176
name := string(pkt.BodySkipNull())
168177
log.Infof("Calling #%s, remoteId: %d, localId: %d", name, remoteId, localId)
169178

170-
if strings.HasPrefix(name, "reverse:") {
171-
name = "xxxx" + name[4:]
172-
// failMessage := "reverse service not supported"
173-
// sess.writePacket(_OKAY, localId, remoteId, nil)
174-
// sess.writePacket(_WRTE, localId, remoteId, []byte("FAIL"+fmt.Sprintf(
175-
// "%04x%s", len(failMessage), failMessage,
176-
// )))
177-
// sess.writePacket(_CLSE, localId, remoteId, nil)
178-
// return
179-
}
180-
181-
// Session service
182-
// device := NewClient("").Device(AnyUsbDevice())
183-
conn, err := sess.device.OpenTransport()
184-
if err != nil {
185-
sess.err = err
186-
return
187-
}
188-
conn.Encode(pkt.BodySkipNull())
189-
if err := conn.CheckOKAY(); err != nil {
190-
sess.err = errors.Wrap(err, "session.OPEN")
191-
return
192-
}
193-
194179
service := &TransportService{
195-
localId: localId,
196-
remoteId: remoteId,
197-
sess: sess,
198-
transport: conn,
180+
localId: localId,
181+
remoteId: remoteId,
182+
sess: sess,
199183
}
200184

201185
sess.mu.Lock()
202186
sess.services[localId] = service
203187
sess.mu.Unlock()
204188

205189
service.handle(pkt)
206-
pkt.DumpToStdout()
190+
// pkt.DumpToStdout()
207191
}
208192

209193
func (sess *Session) forwardServicePacket(pkt Packet) {
210194
sess.mu.Lock()
211195
service, ok := sess.services[pkt.Arg1] // localId
212196
sess.mu.Unlock()
213197
if !ok {
214-
sess.err = errors.New("transport service already closed")
198+
log.Warnf("Receive packet of already closed service: localId: %d", pkt.Arg1)
215199
return
216200
}
217201
service.handle(pkt)
@@ -240,9 +224,37 @@ func (t *TransportService) handle(pkt Packet) {
240224
}
241225
}
242226

227+
func (t *TransportService) writeError(message string) {
228+
t.writePacket(_WRTE, []byte("FAIL"+fmt.Sprintf(
229+
"%04x%s", len(message), message,
230+
)))
231+
}
232+
243233
func (t *TransportService) handleOpenPacket(pkt Packet) {
244234
t.writePacket(_OKAY, nil)
245235

236+
serviceName := string(pkt.BodySkipNull())
237+
if strings.HasPrefix(serviceName, "reverse:") {
238+
failMessage := "reverse service not supported"
239+
t.writeError(failMessage)
240+
t.end()
241+
return
242+
}
243+
244+
var err error
245+
t.transport, err = t.sess.device.OpenTransport()
246+
if err != nil {
247+
t.end()
248+
return
249+
}
250+
t.transport.Encode([]byte(serviceName))
251+
252+
if err := t.transport.CheckOKAY(); err != nil {
253+
t.writeError(err.Error())
254+
t.end()
255+
return
256+
}
257+
246258
go func() {
247259
buf := make([]byte, t.sess.maxPayload)
248260
for {
@@ -259,8 +271,8 @@ func (t *TransportService) handleOpenPacket(pkt Packet) {
259271
}
260272

261273
func (t *TransportService) handleWritePacket(pkt Packet) {
262-
t.transport.Write(pkt.Body)
263274
t.writePacket(_OKAY, nil)
275+
t.transport.Write(pkt.Body)
264276
}
265277

266278
func (t *TransportService) handleClosePacket(pkt Packet) {
@@ -270,7 +282,9 @@ func (t *TransportService) handleClosePacket(pkt Packet) {
270282
func (t *TransportService) end() {
271283
t.once.Do(func() {
272284
t.ended = true
273-
t.transport.Close()
285+
if t.transport != nil {
286+
t.transport.Close()
287+
}
274288
t.writePacket(_CLSE, nil)
275289
})
276290
}

‎adb/tcpusb_test.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package adb
22

3-
import "testing"
4-
5-
func TestTcpUsb(t *testing.T) {
6-
t.Log("adb connect localhost:9000")
7-
err := RunAdbServer("12345678")
8-
if err != nil {
9-
t.Fatal(err)
10-
}
11-
}
3+
// func TestTcpUsb(t *testing.T) {
4+
// t.Log("adb connect localhost:9000")
5+
// err := RunAdbServer("12345678")
6+
// if err != nil {
7+
// t.Fatal(err)
8+
// }
9+
// }
1210

1311
// func TestSliceBytes(t *testing.T) {
1412
// buf := make([]byte, 0)

‎go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ require (
44
github.com/cavaliercoder/grab v2.0.0+incompatible
55
github.com/fatih/color v1.7.0 // indirect
66
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
7-
github.com/kr/pty v1.1.3 // indirect
87
github.com/labstack/tunnel-client v0.2.12
98
github.com/manifoldco/promptui v0.3.2
109
github.com/mattn/go-runewidth v0.0.3 // indirect

0 commit comments

Comments
 (0)
⌂ 换网址