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

AbstractHafasMobileProvider: Implement request body mic (message integrity code) and mac (message authentication code).

Browse source
This commit is contained in:
Andreas Schildbach 2018-07-26 23:02:08 +02:00
parent c410fcda65
commit 9fbd1f1864
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java
View file

@ -48,6 +48,7 @@ import com.google.common.base.Joiner;
import com.google.common.hash.HashCode; import com.google.common.hash.HashCode;
import com.google.common.hash.HashFunction; import com.google.common.hash.HashFunction;
import com.google.common.hash.Hashing; import com.google.common.hash.Hashing;
import com.google.common.io.BaseEncoding;
import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Departure;
import de.schildbach.pte.dto.Fare; import de.schildbach.pte.dto.Fare;
@ -84,8 +85,11 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider
public String apiClient; public String apiClient;
@Nullable @Nullable
public String requestChecksumSalt; public String requestChecksumSalt;
@Nullable
public String requestMicMacSalt;
private static final HashFunction MD5 = Hashing.md5(); private static final HashFunction MD5 = Hashing.md5();
private static final BaseEncoding HEX = BaseEncoding.base16().lowerCase();
public AbstractHafasMobileProvider(final NetworkId network, final HttpUrl apiBase, final Product[] productsMap) { public AbstractHafasMobileProvider(final NetworkId network, final HttpUrl apiBase, final Product[] productsMap) {
super(network, productsMap); super(network, productsMap);
@ -113,6 +117,11 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider
return this; return this;
} }
protected AbstractHafasMobileProvider setRequestMicMacSalt(final String requestMicMacSalt) {
this.requestMicMacSalt = requestMicMacSalt;
return this;
}
@Override @Override
public NearbyLocationsResult queryNearbyLocations(final EnumSet<LocationType> types, final Location location, public NearbyLocationsResult queryNearbyLocations(final EnumSet<LocationType> types, final Location location,
final int maxDistance, final int maxLocations) throws IOException { final int maxDistance, final int maxLocations) throws IOException {
@ -617,6 +626,13 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider
.putString(requestChecksumSalt, Charsets.UTF_8).hash(); .putString(requestChecksumSalt, Charsets.UTF_8).hash();
url.addQueryParameter("checksum", checksum.toString()); url.addQueryParameter("checksum", checksum.toString());
} }
if (requestMicMacSalt != null) {
final HashCode mic = MD5.newHasher().putString(body, Charsets.UTF_8).hash();
url.addQueryParameter("mic", HEX.encode(mic.asBytes()));
final HashCode mac = MD5.newHasher().putString(HEX.encode(mic.asBytes()), Charsets.UTF_8)
.putBytes(HEX.decode(requestMicMacSalt)).hash();
url.addQueryParameter("mac", HEX.encode(mac.asBytes()));
}
return url.build(); return url.build();
} }