Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
1c6cc239
Unverified
Commit
1c6cc239
authored
Jan 29, 2020
by
Emmanuel Garcia
Committed by
GitHub
Jan 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sanitize host before calling pm (#49644)
parent
722b4277
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
100 additions
and
8 deletions
+100
-8
net.dart
packages/flutter_tools/lib/src/base/net.dart
+10
-0
fuchsia_device.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
+5
-8
fuchsia_pm.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart
+4
-0
fuchsia_pm_test.dart
...ter_tools/test/general.shard/fuchsia/fuchsia_pm_test.dart
+81
-0
No files found.
packages/flutter_tools/lib/src/base/net.dart
View file @
1c6cc239
...
...
@@ -233,3 +233,13 @@ class _MemoryIOSink implements IOSink {
@override
Future
<
void
>
flush
()
async
{
}
}
/// Returns [true] if [address] is an IPv6 address.
bool
isIPv6Address
(
String
address
)
{
try
{
Uri
.
parseIPv6Address
(
address
);
return
true
;
}
on
FormatException
{
return
false
;
}
}
packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
View file @
1c6cc239
...
...
@@ -13,6 +13,7 @@ import '../base/context.dart';
import
'../base/file_system.dart'
;
import
'../base/io.dart'
;
import
'../base/logger.dart'
;
import
'../base/net.dart'
;
import
'../base/os.dart'
;
import
'../base/process.dart'
;
import
'../base/time.dart'
;
...
...
@@ -512,14 +513,10 @@ class FuchsiaDevice extends Device {
@override
void
clearLogs
()
{}
bool
get
ipv6
{
try
{
Uri
.
parseIPv6Address
(
id
);
return
true
;
}
on
FormatException
{
return
false
;
}
}
bool
_ipv6
;
/// [true] if the current host address is IPv6.
bool
get
ipv6
=>
_ipv6
??=
isIPv6Address
(
id
);
/// List the ports currently running a dart observatory.
Future
<
List
<
int
>>
servicePorts
()
async
{
...
...
packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart
View file @
1c6cc239
...
...
@@ -5,6 +5,7 @@
import
'../base/common.dart'
;
import
'../base/file_system.dart'
;
import
'../base/io.dart'
;
import
'../base/net.dart'
;
import
'../base/process.dart'
;
import
'../convert.dart'
;
import
'../globals.dart'
as
globals
;
...
...
@@ -109,6 +110,9 @@ class FuchsiaPM {
if
(
fuchsiaArtifacts
.
pm
==
null
)
{
throwToolExit
(
'Fuchsia pm tool not found'
);
}
if
(
isIPv6Address
(
host
.
split
(
'%'
).
first
))
{
host
=
'[
${host.replaceAll('%', '%25')}
]'
;
}
final
List
<
String
>
command
=
<
String
>[
fuchsiaArtifacts
.
pm
.
path
,
'serve'
,
...
...
packages/flutter_tools/test/general.shard/fuchsia/fuchsia_pm_test.dart
0 → 100644
View file @
1c6cc239
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'dart:async'
;
import
'package:flutter_tools/src/base/context.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
import
'package:flutter_tools/src/base/io.dart'
;
import
'package:flutter_tools/src/base/process.dart'
;
import
'package:flutter_tools/src/fuchsia/fuchsia_pm.dart'
;
import
'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart'
;
import
'package:mockito/mockito.dart'
;
import
'../../src/common.dart'
;
import
'../../src/context.dart'
;
import
'../../src/mocks.dart'
;
void
main
(
)
{
group
(
'FuchsiaPM'
,
()
{
MockFile
pm
;
MockProcessManager
mockProcessManager
;
MockFuchsiaArtifacts
mockFuchsiaArtifacts
;
setUp
(()
{
pm
=
MockFile
();
when
(
pm
.
path
).
thenReturn
(
'pm'
);
mockFuchsiaArtifacts
=
MockFuchsiaArtifacts
();
when
(
mockFuchsiaArtifacts
.
pm
).
thenReturn
(
pm
);
mockProcessManager
=
MockProcessManager
();
});
testUsingContext
(
'serve - IPv4 address'
,
()
async
{
when
(
mockProcessManager
.
start
(
any
)).
thenAnswer
((
_
)
{
return
Future
<
Process
>.
value
(
createMockProcess
());
});
await
FuchsiaPM
().
serve
(
'<repo>'
,
'127.0.0.1'
,
43819
);
verify
(
mockProcessManager
.
start
(<
String
>[
'pm'
,
'serve'
,
'-repo'
,
'<repo>'
,
'-l'
,
'127.0.0.1:43819'
,
])).
called
(
1
);
},
overrides:
<
Type
,
Generator
>{
FuchsiaArtifacts:
()
=>
mockFuchsiaArtifacts
,
ProcessManager:
()
=>
mockProcessManager
,
});
testUsingContext
(
'serve - IPv6 address'
,
()
async
{
when
(
mockProcessManager
.
start
(
any
)).
thenAnswer
((
_
)
{
return
Future
<
Process
>.
value
(
createMockProcess
());
});
await
FuchsiaPM
().
serve
(
'<repo>'
,
'fe80::ec4:7aff:fecc:ea8f%eno2'
,
43819
);
verify
(
mockProcessManager
.
start
(<
String
>[
'pm'
,
'serve'
,
'-repo'
,
'<repo>'
,
'-l'
,
'[fe80::ec4:7aff:fecc:ea8f%25eno2]:43819'
,
])).
called
(
1
);
},
overrides:
<
Type
,
Generator
>{
FuchsiaArtifacts:
()
=>
mockFuchsiaArtifacts
,
ProcessManager:
()
=>
mockProcessManager
,
});
});
}
class
MockFuchsiaArtifacts
extends
Mock
implements
FuchsiaArtifacts
{}
class
MockProcessUtils
extends
Mock
implements
ProcessUtils
{}
class
MockFile
extends
Mock
implements
File
{}
class
MockProcess
extends
Mock
implements
Process
{}
class
MockProcessManager
extends
Mock
implements
ProcessManager
{}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment