yvan/activitypubplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trying to lock down activity POST handling content types as per a combo of the specification and also Mastodon behaviour. Reinstanting correct error codes as exceptions. Also some drive-by tidying and weeding & sorting imports.

Browse source
This commit is contained in:
Yvan 2025-02-06 19:21:32 +00:00
parent a88f154714
commit 89cb3bd335
1 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/RestHandler.java
View file

@ -1,24 +1,19 @@
package dev.activitypub.activitypubbot; package dev.activitypub.activitypubbot;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.thymeleaf.context.Context;
import org.thymeleaf.spring5.SpringTemplateEngine;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.server.ResponseStatusException;
/** /**
* Here we handle any JSON/REST requests, which is how ActivityPub instances talk to each other. * Here we handle any JSON/REST requests, which is how ActivityPub instances talk to each other.
@ -43,10 +38,9 @@ public class RestHandler {
*/ */
@GetMapping(value = "/users/{username}", produces = "application/activity+json") // content type based on Masto request @GetMapping(value = "/users/{username}", produces = "application/activity+json") // content type based on Masto request
public Bot actor(@PathVariable String username) { public Bot actor(@PathVariable String username) {
Bot bot = botServ.getBotByUsername( username ); Bot bot = botServ.getBotByUsername( username );
if( bot == null ) { if( bot == null ) {
//return new ResponseEntity<>("These are not the droids you are looking for.", HttpStatus.NOT_FOUND); throw new ResponseStatusException(HttpStatus.NOT_FOUND, "These are not the droids you are looking for.");
} }
return bot; return bot;
} }
@ -62,12 +56,12 @@ public class RestHandler {
int colonPos = resource.indexOf(":"); int colonPos = resource.indexOf(":");
int atPos = resource.indexOf("@"); int atPos = resource.indexOf("@");
if ( colonPos < 0 || atPos < 0 || atPos < colonPos ) { if ( colonPos < 0 || atPos < 0 || atPos < colonPos ) {
//return new ResponseEntity<>("Incorrect query format",HttpStatus.BAD_REQUEST); throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Incorrect query format.");
} }
String username = resource.substring(colonPos + 1, atPos); String username = resource.substring(colonPos + 1, atPos);
Bot bot = botServ.getBotByUsername( username ); Bot bot = botServ.getBotByUsername( username );
if( bot == null ) { if( bot == null ) {
//return new ResponseEntity<>("These are not the droids you are looking for.", HttpStatus.NOT_FOUND); throw new ResponseStatusException(HttpStatus.NOT_FOUND, "These are not the droids you are looking for.");
} }
// TODO: So here's a whole other way of generating custom JSON as // TODO: So here's a whole other way of generating custom JSON as
@ -90,14 +84,29 @@ public class RestHandler {
/** /**
* * Here we handle JSON POST requests to a bot's inbox URL, this could be
* any one of a variety of different ActivityPub "actions" as per:
* https://w3c.github.io/activitypub/#server-to-server-interactions
* which also documents content types.
*/ */
@PostMapping(value = "/users/{username}/inbox", produces = "application/activity+json") // content type based on Masto request @PostMapping(
value = "/users/{username}/inbox",
consumes = { // possible values of the POST "Content-Type" header, as per spec
"application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"",
"application/activity+json"
},
produces = { // possible values of the POST "Accept" header?
"application/activity+json",
"application/ld+json;", // Mastodon seems to require the semi-colon but with any old garbage after it, spring-boot seems to ignore the semi-colon anyway
"application/json" // not as per spec, but Mastodon accepts this
}
)
public String inboxpost(@PathVariable String username, @RequestBody Map<String, Object> postdata) { public String inboxpost(@PathVariable String username, @RequestBody Map<String, Object> postdata) {
log.info("RestHandler::inboxpost: " + username + " map: " + postdata.toString()); log.info("RestHandler::inboxpost: " + username + " map: " + postdata.toString());
Bot bot = botServ.getBotByUsername( username ); Bot bot = botServ.getBotByUsername( username );
if( bot == null ) { if( bot == null ) {
//return new ResponseEntity<>("These are not the droids you are looking for.", HttpStatus.NOT_FOUND); throw new ResponseStatusException(HttpStatus.NOT_FOUND, "These are not the droids you are looking for.");
} }
if( !postdata.containsKey("type") ) { if( !postdata.containsKey("type") ) {
// no request type, so we think we've been sent junk // no request type, so we think we've been sent junk
@ -128,5 +137,4 @@ public class RestHandler {
throw new ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, "Unknown 'type': " + postdata.get("type") ); throw new ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, "Unknown 'type': " + postdata.get("type") );
} }
} }
} }