Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
bitmask_android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
72
Issues
72
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
leap
bitmask_android
Commits
5fd9cd73
Commit
5fd9cd73
authored
May 20, 2019
by
cyberta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve provider json validation during setup
parent
df991bb8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
...in/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
+10
-9
app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java
...uction/java/se/leap/bitmaskclient/ProviderApiManager.java
+2
-2
No files found.
app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
View file @
5fd9cd73
...
...
@@ -54,7 +54,6 @@ import okhttp3.OkHttpClient;
import
se.leap.bitmaskclient.Constants.CREDENTIAL_ERRORS
;
import
se.leap.bitmaskclient.utils.ConfigHelper
;
import
static
se
.
leap
.
bitmaskclient
.
utils
.
ConfigHelper
.
getFingerprintFromCertificate
;
import
static
se
.
leap
.
bitmaskclient
.
Constants
.
BROADCAST_PROVIDER_API_EVENT
;
import
static
se
.
leap
.
bitmaskclient
.
Constants
.
BROADCAST_RESULT_CODE
;
import
static
se
.
leap
.
bitmaskclient
.
Constants
.
BROADCAST_RESULT_KEY
;
...
...
@@ -107,6 +106,7 @@ import static se.leap.bitmaskclient.R.string.vpn_certificate_is_invalid;
import
static
se
.
leap
.
bitmaskclient
.
R
.
string
.
warning_corrupted_provider_cert
;
import
static
se
.
leap
.
bitmaskclient
.
R
.
string
.
warning_corrupted_provider_details
;
import
static
se
.
leap
.
bitmaskclient
.
R
.
string
.
warning_expired_provider_cert
;
import
static
se
.
leap
.
bitmaskclient
.
utils
.
ConfigHelper
.
getFingerprintFromCertificate
;
import
static
se
.
leap
.
bitmaskclient
.
utils
.
ConfigHelper
.
parseRsaKeyFromString
;
import
static
se
.
leap
.
bitmaskclient
.
utils
.
PreferenceHelper
.
deleteProviderDetailsFromPreferences
;
import
static
se
.
leap
.
bitmaskclient
.
utils
.
PreferenceHelper
.
getFromPersistedProvider
;
...
...
@@ -271,9 +271,6 @@ public abstract class ProviderApiManagerBase {
}
}
private
Bundle
tryToRegister
(
Provider
provider
,
Bundle
task
)
{
Bundle
result
=
new
Bundle
();
...
...
@@ -697,7 +694,14 @@ public abstract class ProviderApiManagerBase {
}
Bundle
validateProviderDetails
(
Provider
provider
)
{
Bundle
result
=
validateCertificateForProvider
(
provider
);
Bundle
result
=
new
Bundle
();
result
.
putBoolean
(
BROADCAST_RESULT_KEY
,
false
);
if
(!
provider
.
hasDefinition
())
{
return
result
;
}
result
=
validateCertificateForProvider
(
result
,
provider
);
//invalid certificate or no certificate
if
(
result
.
containsKey
(
ERRORS
)
||
(
result
.
containsKey
(
BROADCAST_RESULT_KEY
)
&&
!
result
.
getBoolean
(
BROADCAST_RESULT_KEY
))
)
{
...
...
@@ -709,10 +713,7 @@ public abstract class ProviderApiManagerBase {
return
result
;
}
protected
Bundle
validateCertificateForProvider
(
Provider
provider
)
{
Bundle
result
=
new
Bundle
();
result
.
putBoolean
(
BROADCAST_RESULT_KEY
,
false
);
protected
Bundle
validateCertificateForProvider
(
Bundle
result
,
Provider
provider
)
{
String
caCert
=
provider
.
getCaCert
();
if
(
ConfigHelper
.
checkErroneousDownload
(
caCert
))
{
...
...
app/src/production/java/se/leap/bitmaskclient/ProviderApiManager.java
View file @
5fd9cd73
...
...
@@ -84,13 +84,13 @@ public class ProviderApiManager extends ProviderApiManagerBase {
getPersistedProviderUpdates
(
provider
);
currentDownload
=
validateProviderDetails
(
provider
);
//provider
details
invalid
//provider
certificate
invalid
if
(
currentDownload
.
containsKey
(
ERRORS
))
{
currentDownload
.
putParcelable
(
PROVIDER_KEY
,
provider
);
return
currentDownload
;
}
//no provider certificate available
//no provider
json or
certificate available
if
(
currentDownload
.
containsKey
(
BROADCAST_RESULT_KEY
)
&&
!
currentDownload
.
getBoolean
(
BROADCAST_RESULT_KEY
))
{
resetProviderDetails
(
provider
);
}
...
...
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