Skip to content

Fixes in pinning configuration #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Fixes in pinning configuration #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2317237
Add missing export; rename file
gthea Oct 15, 2024
fe9f6c0
Replace Set with List
gthea Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions splitio/lib/splitio.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export 'package:splitio_platform_interface/split_impression.dart';
export 'package:splitio_platform_interface/split_result.dart';
export 'package:splitio_platform_interface/split_sync_config.dart';
export 'package:splitio_platform_interface/split_view.dart';
export 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart';

typedef ClientReadinessCallback = void Function(SplitClient splitClient);

Expand Down
6 changes: 3 additions & 3 deletions ...ib/certificate_pinning_configuration.dart → ...it_certificate_pinning_configuration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CertificatePinningConfiguration {

final Map<String, Set<String>> _pins = {};
final Map<String, List<String>> _pins = {};

Map<String, Set<String>> get pins => _pins;
Map<String, List<String>> get pins => _pins;

CertificatePinningConfiguration addPin(String host, String pin) {
pin = pin.trim();
Expand All @@ -11,7 +11,7 @@ class CertificatePinningConfiguration {
}

if (!_pins.containsKey(host)) {
_pins[host] = <String>{};
_pins[host] = [];
}

_pins[host]?.add(pin);
Expand Down
12 changes: 6 additions & 6 deletions splitio_platform_interface/lib/split_configuration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:splitio_platform_interface/certificate_pinning_configuration.dart';
import 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart';
import 'package:splitio_platform_interface/split_sync_config.dart';

class SplitConfiguration {
Expand Down Expand Up @@ -46,7 +46,7 @@ class SplitConfiguration {
///
/// [readyTimeout] Maximum amount of time in seconds to wait before firing the SDK_READY_TIMED_OUT event. Defaults to 10 seconds.
///
/// [certificatePinningConfig] Certificate pinning configuration. It is a map where the key is the host and the value is a set of base64 SHA-256 or base64 SHA-1 hashes of the SPKI.
/// [certificatePinningConfiguration] Certificate pinning configuration. It is a map where the key is the host and the value is a set of base64 SHA-256 or base64 SHA-1 hashes of the SPKI.
SplitConfiguration({
int? featuresRefreshRate,
int? segmentsRefreshRate,
Expand All @@ -73,7 +73,7 @@ class SplitConfiguration {
bool? encryptionEnabled,
SplitLogLevel? logLevel,
int? readyTimeout = 10,
CertificatePinningConfiguration? certificatePinningConfig,
CertificatePinningConfiguration? certificatePinningConfiguration,
}) {
if (featuresRefreshRate != null) {
configurationMap['featuresRefreshRate'] = featuresRefreshRate;
Expand Down Expand Up @@ -180,10 +180,10 @@ class SplitConfiguration {
configurationMap['readyTimeout'] = readyTimeout;
}

if (certificatePinningConfig != null &&
certificatePinningConfig.pins.isNotEmpty) {
if (certificatePinningConfiguration != null &&
certificatePinningConfiguration.pins.isNotEmpty) {
configurationMap['certificatePinningConfiguration'] = {
'pins': certificatePinningConfig.pins
'pins': certificatePinningConfiguration.pins
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion splitio_platform_interface/test/certificate_pinning_configuration_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:splitio_platform_interface/certificate_pinning_configuration.dart';
import 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart';

void main() {
test('single pin can be added', () {
Expand Down
4 changes: 2 additions & 2 deletions splitio_platform_interface/test/splitio_configuration_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:splitio_platform_interface/certificate_pinning_configuration.dart';
import 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart';
import 'package:splitio_platform_interface/split_configuration.dart';
import 'package:splitio_platform_interface/split_sync_config.dart';

Expand Down Expand Up @@ -31,7 +31,7 @@ void main() {
encryptionEnabled: true,
logLevel: SplitLogLevel.debug,
readyTimeout: 1,
certificatePinningConfig: CertificatePinningConfiguration()
certificatePinningConfiguration: CertificatePinningConfiguration()
.addPin('host1', 'pin1')
.addPin('host2', 'pin3')
.addPin('host1', 'pin2'));
Expand Down