Skip to content

Commit

Permalink
Authorization features.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tadscottsmith
tadscottsmith committed Nov 29, 2023
1 parent 2ecdaba commit 45c8bb7
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 33 deletions.
69 changes: 40 additions & 29 deletions src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzBroadcaster.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@


/**
* Audio broadcaster to push completed audio recordings to the Rdio Scanner call upload API.
* Audio broadcaster to push completed audio recordings to the OpenMHz call upload API.
*
*/
public class OpenMHzBroadcaster extends AbstractAudioBroadcaster<OpenMHzConfiguration>
Expand All @@ -81,6 +81,7 @@ public class OpenMHzBroadcaster extends AbstractAudioBroadcaster<OpenMHzConfigur
private static final String MULTIPART_TYPE = "multipart";
private static final String DEFAULT_SUBTYPE = "form-data";
private static final String MULTIPART_FORM_DATA = MULTIPART_TYPE + "/" + DEFAULT_SUBTYPE;
private static final String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
private Queue<AudioRecording> mAudioRecordingQueue = new LinkedTransferQueue<>();
private ScheduledFuture<?> mAudioRecordingProcessorFuture;
private HttpClient mHttpClient = HttpClient.newBuilder()
Expand Down Expand Up @@ -115,16 +116,16 @@ public void start()
mLastConnectionAttempt = System.currentTimeMillis();

/**
* Rdio Scanner API does not currently expose a test method.
* OpenMHz API does not currently expose a test method.
* TODO: FIX THIS
*/
if(response != null)// && response.toLowerCase().startsWith("<head><title>502 bad gateway</title></head>"))
if(response == "OK")// && response.toLowerCase().startsWith("<head><title>502 bad gateway</title></head>"))
{
setBroadcastState(BroadcastState.CONNECTED);
}
else
{
mLog.error("Error connecting to Rdio Scanner server on startup [" + response + "]");
mLog.error("Error connecting to OpenMHz server on startup [" + response + "]");
setBroadcastState(BroadcastState.ERROR);
}

Expand Down Expand Up @@ -170,7 +171,7 @@ public void dispose()
* server. If there is a connectivity or other issue, the broadcast state is set to temporary error and
* the audio processor thread will persistently invoke this method to attempt a reconnect.
*
* Rdio Scanner does not have a test API endpoint, so we look for the incomplete call response.
* OpenMHz does not have a test API endpoint, so we look for the incomplete call response.
*/
private boolean connected()
{
Expand All @@ -182,7 +183,7 @@ private boolean connected()
String response = testConnection(getBroadcastConfiguration());
mLastConnectionAttempt = System.currentTimeMillis();

if(response != null && response.toLowerCase().startsWith("incomplete call data: no talkgroup"))
if(response != null && response == "200")
{
setBroadcastState(BroadcastState.CONNECTED);
}
Expand Down Expand Up @@ -256,11 +257,12 @@ private void processRecordingQueue()
}
catch(IOException e)
{
mLog.error("Rdio Scanner API - audio recording file not found - ignoring upload");
mLog.error("OpenMHz - audio recording file not found - ignoring upload");
}

if(audioBytes != null)
{
String uri = getBroadcastConfiguration().getHost() + "/" + getBroadcastConfiguration().getSystemName() + "/upload";

OpenMHzBuilder bodyBuilder = new OpenMHzBuilder();
bodyBuilder
Expand All @@ -272,17 +274,14 @@ private void processRecordingQueue()
.addPart(FormField.TALKGROUP_NUM, talkgroup)
.addPart(FormField.EMERGENCY, 0)
.addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
.addPart(FormField.PATCHES, patches)
// For future use if OpenMHz supports patch information
//.addPart(FormField.PATCHES, patches)
.addPart(FormField.SOURCE_LIST, "[{ \"pos\": 0.00, \"src\": " + radioId + "}]");
//.addPart(FormField.FREQ_LIST, frequency)



HttpRequest fileRequest = HttpRequest.newBuilder()
.uri(URI.create(getBroadcastConfiguration().getHost()))
.uri(URI.create(uri))
.header(HttpHeaders.CONTENT_TYPE, MULTIPART_FORM_DATA + "; boundary=" + bodyBuilder.getBoundary())
.header(HttpHeaders.USER_AGENT, "sdrtrunk")
//.header(HttpHeaders.CONTENT_TYPE, "application/octet-stream")
.POST(bodyBuilder.build())
.build();

Expand All @@ -295,14 +294,14 @@ private void processRecordingQueue()
//We get socket reset exceptions occasionally when the remote server doesn't
//fully read our request and immediately responds.
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
mLog.error("Rdio Scanner API file upload fail [" +
mLog.error("OpenMHz API file upload fail [" +
fileResponse.statusCode() + "] response [" +
fileResponse.body() + "]");
}
else
{
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
mLog.error("Rdio Scanner API file upload fail [" +
mLog.error("OpenMHz API file upload fail [" +
fileResponse.statusCode() + "] response [" +
fileResponse.body() + "]");
}
Expand All @@ -324,7 +323,7 @@ private void processRecordingQueue()
else
{
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
mLog.error("Rdio Scanner API file upload fail [" +
mLog.error("OpenMHz API file upload fail [" +
fileResponse.statusCode() + "] response [" +
fileResponse.body() + "]");
}
Expand All @@ -337,7 +336,7 @@ private void processRecordingQueue()
else
{
//Register an error for the file not found exception
mLog.error("Rdio Scanner API - upload file not found [" +
mLog.error("OpenMHz API - upload file not found [" +
audioRecording.getPath().toString() + "]");
incrementErrorAudioCount();
broadcast(new BroadcastEvent(OpenMHzBroadcaster.this,
Expand Down Expand Up @@ -547,21 +546,19 @@ public static String getPatches(AudioRecording audioRecording)
*/
public static String testConnection(OpenMHzConfiguration configuration)
{
String uri = configuration.getHost() + "/" + configuration.getSystemName() + "/authorize";

HttpClient httpClient = HttpClient.newBuilder()
.version(HttpClient.Version.HTTP_1_1)
.followRedirects(HttpClient.Redirect.NORMAL)
.connectTimeout(Duration.ofSeconds(20))
.build();

OpenMHzBuilder bodyBuilder = new OpenMHzBuilder();
bodyBuilder.addPart(FormField.API_KEY, configuration.getApiKey());

HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(configuration.getHost()))
.header(HttpHeaders.CONTENT_TYPE, MULTIPART_FORM_DATA + "; boundary=" + bodyBuilder.getBoundary())
.uri(URI.create(uri))
.header(HttpHeaders.CONTENT_TYPE, APPLICATION_FORM_URLENCODED)
.header(HttpHeaders.USER_AGENT, "sdrtrunk")
.header(HttpHeaders.ACCEPT, "*/*")
.POST(bodyBuilder.build())
.POST(HttpRequest.BodyPublishers.ofString("api_key="+configuration.getApiKey()))
.build();

HttpResponse.BodyHandler<String> responseHandler = HttpResponse.BodyHandlers.ofString();
Expand All @@ -570,7 +567,20 @@ public static String testConnection(OpenMHzConfiguration configuration)
{
HttpResponse<String> response = httpClient.send(request, responseHandler);
String responseBody = response.body();
return (responseBody != null ? responseBody : "(no response)") + " Status Code:" + response.statusCode();
if (response.statusCode() == 200)
{
return "OK";
}
else if(response.statusCode() == 403)
{
return "Invalid API Key";
}
else if(response.statusCode() == 500)
{
return "Invalid System Name";
}

return "No Response";
}
catch(Exception e)
{
Expand All @@ -597,20 +607,21 @@ public static void main(String[] args)
config.setSystemName("systemx");

String response = testConnection(config);
mLog.error("Response: " + response);

if(response == null)
if(response == "OK")
{
mLog.debug("Test Successful!");
}
else
{
if(response.contains("1 Invalid-API-Key"))
if(response.contains("Invalid API Key"))
{
mLog.error("Invalid API Key");
}
else if(response.contains("1 API-Key-Access-Denied"))
else if(response.contains("Invalid System Name"))
{
mLog.error("System ID not valid for API Key");
mLog.error("Invalid System Name");
}
else
{
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ private String formatFilePart(String boundary)
}
StringBuilder sb= new StringBuilder();
sb.append(DASH_DASH).append(boundary).append("\r\n");
sb.append("Content-Disposition: form-data; name=\"").append("call").append("\"; filename=\"test.m4a\"\r\n");
sb.append("Content-Type: application/octet-stream\r\n\r\n");
sb.append("Content-Disposition: form-data; name=\"").append("call").append("\"; filename=\"audio.mp3\"\r\n\r\n");
return sb.toString();

}
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
*/
public class OpenMHzConfiguration extends BroadcastConfiguration
{
public static final String PRODUCTION_ENDPOINT = "https://api.openmhz.com";

private StringProperty mSystemName = new SimpleStringProperty();
private StringProperty mApiKey = new SimpleStringProperty();

Expand All @@ -58,6 +60,11 @@ public OpenMHzConfiguration(BroadcastFormat format)
{
super(format);

if(getHost() == null)
{
setHost(PRODUCTION_ENDPOINT);
}

//The parent class binds this property, so we unbind it and rebind it here
mValid.unbind();
mValid.bind(Bindings.and(Bindings.and(Bindings.isNotNull(mSystemName), Bindings.isNotNull(mApiKey)),
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,15 @@ protected GridPane getEditorPane()
GridPane.setConstraints(getApiKeyTextField(), 1, row);
mEditorPane.getChildren().add(getApiKeyTextField());

Label systemNameLabel = new Label("System Name");
Label systemNameLabel = new Label("System Short Name");
GridPane.setHalignment(systemNameLabel, HPos.RIGHT);
GridPane.setConstraints(systemNameLabel, 0, ++row);
mEditorPane.getChildren().add(systemNameLabel);

GridPane.setConstraints(getSystemNameTextField(), 1, row);
mEditorPane.getChildren().add(getSystemNameTextField());

Label hostLabel = new Label("OpenMHz URL");
Label hostLabel = new Label("OpenMHz Upload Server (API)");
GridPane.setHalignment(hostLabel, HPos.RIGHT);
GridPane.setConstraints(hostLabel, 0, ++row);
mEditorPane.getChildren().add(hostLabel);
Expand Down

0 comments on commit 45c8bb7

Please sign in to comment.