laantungir/zapstore
1
0
Fork 0
mirror of https://github.com/zapstore/zapstore.git synced 2026-10-06 04:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hash verification changes, closes #89, closes #103

Browse Source
This commit is contained in:
franzap
2024-06-14 00:11:50 -03:00
parent 6bd1affa34
commit b79b42d5d3
2 changed files with 86 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/models/app.dart
+17 -4
View File
@@ -97,7 +97,7 @@ class App extends BaseApp with DataModelMixin<App> {
}
final hash = latestMetadata!.hash!;
final size = latestMetadata!.size ?? '';
final size = int.tryParse(latestMetadata!.size ?? '');
final dir = await getApplicationSupportDirectory();
final file = File(path.join(dir.path, hash));
@@ -106,11 +106,22 @@ class App extends BaseApp with DataModelMixin<App> {
notifier.state = DeviceInstallProgress();
if (await _isHashMismatch(file.path, hash)) {
var e = 'Hash mismatch, ';
if (size != null) {
if (size == await file.length()) {
e += 'likely a malicious file.';
} else {
e += 'bad data ($size is not ${await file.length()}).';
}
} else {
e += 'possibly broken download.';
}
e += ' Please try again.';
await file.delete();
notifier.state = ErrorInstallProgress(
Exception('Hash mismatch, aborted installation'));
notifier.state = ErrorInstallProgress(Exception(e));
return;
}
notifier.state = HashVerifiedInstallProgress();
final result = await InstallPlugin.install(file.path);
if (result['isSuccess']) {
@@ -139,7 +150,7 @@ class App extends BaseApp with DataModelMixin<App> {
uri = Uri.parse(backupUrl);
response = await client.send(http.Request('GET', uri));
}
final totalBytes = response.contentLength ?? int.tryParse(size) ?? 1;
final totalBytes = response.contentLength ?? size ?? 1;
sub = response.stream.listen((chunk) {
final data = Uint8List.fromList(chunk);
@@ -333,6 +344,8 @@ class DownloadingInstallProgress extends AppInstallProgress {
class DeviceInstallProgress extends AppInstallProgress {}
class HashVerifiedInstallProgress extends AppInstallProgress {}
class ErrorInstallProgress extends AppInstallProgress {
final Exception e;
ErrorInstallProgress(this.e);
lib/screens/app_detail_screen.dart
+69 -12
View File
@@ -184,15 +184,15 @@ class AppDetailScreen extends HookConsumerWidget {
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text('SHA-256 hash (tap to copy)'),
Text('APK package SHA-256'),
Flexible(
child: GestureDetector(
onTap: () {
Clipboard.setData(ClipboardData(
text: app.latestMetadata!.hash!));
showToast(
'Copied SHA-256 to the clipboard',
duration: Duration(seconds: 2),
'Copied APK package SHA-256 to the clipboard',
duration: Duration(seconds: 3),
animDuration:
Duration(milliseconds: 300),
animation:
@@ -204,9 +204,60 @@ class AppDetailScreen extends HookConsumerWidget {
context: context,
);
},
child: Text(
'${app.latestMetadata!.hash!.substring(0, 6)}...${app.latestMetadata!.hash!.substring(58, 64)}',
maxLines: 1,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
'${app.latestMetadata!.hash!.substring(0, 6)}...${app.latestMetadata!.hash!.substring(58, 64)}',
maxLines: 1,
),
Gap(6),
Icon(Icons.copy_rounded, size: 18)
],
),
),
),
],
),
),
if (app.latestMetadata?.apkSignatureHash != null)
Padding(
padding: const EdgeInsets.all(8),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text('APK certificate SHA-256'),
Flexible(
child: GestureDetector(
onTap: () {
Clipboard.setData(ClipboardData(
text: app.latestMetadata!
.apkSignatureHash!));
showToast(
'Copied APK certificate SHA-256 to the clipboard',
duration: Duration(seconds: 3),
animDuration:
Duration(milliseconds: 300),
animation:
StyledToastAnimation.fade,
reverseAnimation:
StyledToastAnimation.fade,
position:
StyledToastPosition.bottom,
context: context,
);
},
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
'${app.latestMetadata!.apkSignatureHash!.substring(0, 6)}...${app.latestMetadata!.apkSignatureHash!.substring(58, 64)}',
maxLines: 1,
),
Gap(6),
Icon(Icons.copy_rounded, size: 18)
],
),
),
),
@@ -461,7 +512,7 @@ class InstallButton extends ConsumerWidget {
},
ErrorInstallProgress(:final e) => () {
// show error and reset state to idle
context.showError(e.toString());
context.showError((e as dynamic).message);
ref
.read(installationProgressProvider(app.id!.toString())
.notifier)
@@ -514,7 +565,12 @@ class InstallButton extends ConsumerWidget {
? SizedBox(
width: 14, height: 14, child: CircularProgressIndicator())
: Text(
'${app.canUpdate ? 'Updating' : 'Installing'} on device'),
'Requesting ${app.canUpdate ? 'update' : 'installation'} on device'),
HashVerifiedInstallProgress() => compact
? SizedBox(
width: 14, height: 14, child: CircularProgressIndicator())
: Text(
'Hash verified, ${app.canUpdate ? 'updating' : 'installing'}'),
ErrorInstallProgress() => compact
? SizedBox(width: 14, height: 14, child: Icon(Icons.error))
: Text('Error, tap to see message'),
@@ -647,7 +703,7 @@ class WebOfTrustContainer extends HookConsumerWidget {
text: TextSpan(
children: [
if (hasUser && npub != franzapsNpub) TextSpan(text: 'You, '),
for (final tu in trustedUsersWithoutUser)
for (final trustedUser in trustedUsersWithoutUser)
TextSpan(
style: TextStyle(height: 1.6),
children: [
@@ -656,15 +712,16 @@ class WebOfTrustContainer extends HookConsumerWidget {
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
RoundedImage(url: tu.avatarUrl, size: 20),
RoundedImage(
url: trustedUser.avatarUrl, size: 20),
Text(
' ${tu.nameOrNpub}${trustedUsersWithoutUser.indexOf(tu) == trustedUsersWithoutUser.length - 1 ? '' : ', '}',
' ${trustedUser.nameOrNpub}${trustedUsersWithoutUser.indexOf(trustedUser) == trustedUsersWithoutUser.length - 1 ? '' : ', '}',
style: TextStyle(fontWeight: FontWeight.bold),
),
],
),
),
if (trustedUsersWithoutUser.indexOf(tu) ==
if (trustedUsersWithoutUser.indexOf(trustedUser) ==
trustedUsersWithoutUser.length - 1)
TextSpan(
text: ' and others follow this signer on nostr.',