0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure that tokens are passed only in the header

Browse source
This commit is contained in:
Vishnu Mohandas 2020-11-27 12:22:07 +05:30
parent 19cb8989fe
commit cd224e523d
3 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/models/file.dart
View file

@ -107,9 +107,7 @@ class File {
String getDownloadUrl() {
return Configuration.instance.getHttpEndpoint() +
"/files/download/" +
uploadedFileID.toString() +
"?token=" +
Configuration.instance.getToken();
uploadedFileID.toString();
}
// Passing token within the URL due to https://github.com/flutter/flutter/issues/16466
@ -125,9 +123,7 @@ class File {
String getThumbnailUrl() {
return Configuration.instance.getHttpEndpoint() +
"/files/preview/" +
uploadedFileID.toString() +
"?token=" +
Configuration.instance.getToken();
uploadedFileID.toString();
}
@override

22
lib/ui/settings_page.dart
View file

@ -2,6 +2,7 @@ import 'dart:io';
import 'package:archive/archive_io.dart';
import 'package:crisp/crisp.dart';
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
@ -139,14 +140,19 @@ class UsageWidgetState extends State<UsageWidget> {
}
void _getUsage() {
Network.instance.getDio().get(
Configuration.instance.getHttpEndpoint() + "/billing/usage",
queryParameters: {
"startTime": 0,
"endTime": DateTime.now().microsecondsSinceEpoch,
"token": Configuration.instance.getToken(),
},
).catchError((e) async {
Network.instance
.getDio()
.get(
Configuration.instance.getHttpEndpoint() + "/billing/usage",
queryParameters: {
"startTime": 0,
"endTime": DateTime.now().microsecondsSinceEpoch,
},
options: Options(
headers: {"X-Auth-Token": Configuration.instance.getToken()},
),
)
.catchError((e) async {
Logger("Settings").severe(e);
}).then((response) async {
if (response != null && response.statusCode == 200) {

11
lib/utils/file_util.dart
View file

@ -195,6 +195,9 @@ Future<io.File> _downloadAndDecrypt(File file, BaseCacheManager cacheManager,
.download(
file.getDownloadUrl(),
encryptedFilePath,
options: Options(
headers: {"X-Auth-Token": Configuration.instance.getToken()},
),
onReceiveProgress: progressCallback,
)
.then((response) async {
@ -246,7 +249,13 @@ Future<io.File> _downloadAndDecryptThumbnail(File file) async {
"_thumbnail.decrypted";
return Network.instance
.getDio()
.download(file.getThumbnailUrl(), temporaryPath)
.download(
file.getThumbnailUrl(),
temporaryPath,
options: Options(
headers: {"X-Auth-Token": Configuration.instance.getToken()},
),
)
.then((_) async {
final encryptedFile = io.File(temporaryPath);
final thumbnailDecryptionKey = decryptFileKey(file);