mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-20 17:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AbstractHafasClientInterfaceProvider: Derive checksum and mic/mac salts.

Browse source
This commit is contained in:
Andreas Schildbach 2019-01-05 14:21:52 +01:00
parent 2390da90d6
commit c5b140b073
10 changed files with 44 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
enabler/test/de/schildbach/pte/live/DbProviderLiveTest.java
View file

@ -26,6 +26,7 @@ import java.util.EnumSet;
import org.junit.Test;
import de.schildbach.pte.AbstractHafasClientInterfaceProvider;
import de.schildbach.pte.DbProvider;
import de.schildbach.pte.NetworkProvider.Accessibility;
import de.schildbach.pte.NetworkProvider.WalkSpeed;
@ -44,7 +45,8 @@ import de.schildbach.pte.dto.TripOptions;
*/
public class DbProviderLiveTest extends AbstractProviderLiveTest {
public DbProviderLiveTest() {
super(new DbProvider(secretProperty("db.api_authorization")));
super(new DbProvider(secretProperty("db.api_authorization"), AbstractHafasClientInterfaceProvider
.decryptSalt(secretProperty("db.encrypted_salt"), secretProperty("hci.salt_encryption_key"))));
}
@Test

4
enabler/test/de/schildbach/pte/live/InvgProviderLiveTest.java
View file

@ -23,6 +23,7 @@ import java.util.Date;
import org.junit.Test;
import de.schildbach.pte.AbstractHafasClientInterfaceProvider;
import de.schildbach.pte.InvgProvider;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
@ -36,7 +37,8 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
*/
public class InvgProviderLiveTest extends AbstractProviderLiveTest {
public InvgProviderLiveTest() {
super(new InvgProvider(secretProperty("invg.api_authorization")));
super(new InvgProvider(secretProperty("invg.api_authorization"), AbstractHafasClientInterfaceProvider
.decryptSalt(secretProperty("invg.encrypted_salt"), secretProperty("hci.salt_encryption_key"))));
}
@Test

4
enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
View file

@ -26,6 +26,7 @@ import java.util.Date;
import org.junit.Assert;
import org.junit.Test;
import de.schildbach.pte.AbstractHafasClientInterfaceProvider;
import de.schildbach.pte.VbbProvider;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
@ -40,7 +41,8 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
*/
public class VbbProviderLiveTest extends AbstractProviderLiveTest {
public VbbProviderLiveTest() {
super(new VbbProvider(secretProperty("vbb.api_authorization")));
super(new VbbProvider(secretProperty("vbb.api_authorization"), AbstractHafasClientInterfaceProvider
.decryptSalt(secretProperty("vbb.encrypted_salt"), secretProperty("hci.salt_encryption_key"))));
}
@Test

4
enabler/test/de/schildbach/pte/live/VgsProviderLiveTest.java
View file

@ -23,6 +23,7 @@ import java.util.Date;
import org.junit.Test;
import de.schildbach.pte.AbstractHafasClientInterfaceProvider;
import de.schildbach.pte.VgsProvider;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
@ -36,7 +37,8 @@ import de.schildbach.pte.dto.SuggestLocationsResult;
*/
public class VgsProviderLiveTest extends AbstractProviderLiveTest {
public VgsProviderLiveTest() {
super(new VgsProvider(secretProperty("vgs.api_authorization")));
super(new VgsProvider(secretProperty("vgs.api_authorization"), AbstractHafasClientInterfaceProvider
.decryptSalt(secretProperty("vgs.encrypted_salt"), secretProperty("hci.salt_encryption_key"))));
}
@Test

5
enabler/test/de/schildbach/pte/live/secrets.properties.template
View file

@ -1,15 +1,20 @@
# Secrets are needed to run some of the live tests.
navitia.authorization =
hci.salt_encryption_key =
db.api_authorization =
db.encrypted_salt =
bvg.api_authorization =
vbb.api_authorization =
vbb.encrypted_salt =
nvv.api_authorization =
sh.api_authorization =
vbn.api_authorization =
nasa.api_authorization =
vgs.api_authorization =
vgs.encrypted_salt =
vmt.api_authorization =
invg.api_authorization =
invg.encrypted_salt =
avv_aachen.api_authorization =
oebb.api_authorization =
vor.api_authorization =