caminus/caminus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement economy API, and server authentication API

Browse Source
This commit is contained in:
Trever Fischer
2012-04-02 14:32:54 -04:00
parent 6bb96e82cf
commit 639fdc1d12
4 changed files with 124 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/handlers.py
View File

@@ -66,17 +66,39 @@ class PlayerSessionHandler(BaseHandler):
allowed_methods = ('POST', 'PUT')
model = PlayerSession
def create(self, request):
hostname = request.POST['hostname']
playername = request.POST['player']
def create(self, request, playername):
ip = request.POST['ip']
server = Server.objects.get(hostname__exact=hostname)
server = request.server
profile = MinecraftProfile.objects.get(mc_username__exact=playername)
session = PlayerSession.objects.create(server=server, player=profile, ip=ip)
return {'session':session.id}
def update(self, request):
def update(self, request, playername):
session = PlayerSession.objects.get(id__exact=request.POST['session'])
session.end = datetime.now()
session.save()
class EconomyHandler(BaseHandler):
allowed_methods = ('PUT','GET')
def read(self, request, playername):
player = MinecraftProfile.objects.get(mc_username__exact=playername)
return {'balance': player.currencyaccount.balance}
def update(self, request, playername):
player = MinecraftProfile.objects.get(mc_username__exact=playername)
delta = request.POST['delta']
newBalance = player.currencyaccount.balance+float(delta)
if newBalance >= 0:
player.currencyaccount.balance = newBalance
player.currencyaccount.save()
return {'success': True, 'balance': newBalance, 'message': ""}
else:
return {'success': False, 'balance': player.currencyaccount.balance, 'message': "Insufficient balance"}
class ServerPingHandler(BaseHandler):
allowed_methods = ('GET',)
def read(self, request):
return {'identity': request.server}

63
api/tests.py
View File

@@ -3,6 +3,26 @@ import json
from django.test.client import Client
from django.contrib.auth.models import User
from minecraft.models import MinecraftProfile, Server, PlayerSession
import hashlib
class ServerPingTest(unittest.TestCase):
def setUp(self):
self.client = Client()
self.user = User.objects.create_user('ValidUsername', 'test@example.com')
self.user.minecraftprofile.mc_username = "ValidUsername"
self.user.minecraftprofile.save()
self.server = Server.objects.create(hostname='localhost', secret='secret')
tokenHash = hashlib.sha1()
tokenHash.update("%s%s%s"%('localhost', 0, 'secret'))
self.token = "%s$%s$%s"%('localhost', 0, tokenHash.hexdigest())
def tearDown(self):
self.user.delete()
self.server.delete()
def testPing(self):
resp = self.client.get('/api/server/whoami', HTTP_AUTHORIZATION='X-Caminus %s'%(self.token))
self.assertEqual(resp.status_code, 200)
class MOTDTest(unittest.TestCase):
def setUp(self):
@@ -60,22 +80,57 @@ class SessionTest(unittest.TestCase):
self.user = User.objects.create_user('ValidUsername', 'test@example.com')
self.user.minecraftprofile.mc_username = "ValidUsername"
self.user.minecraftprofile.save()
self.server = Server.objects.create(hostname='localhost')
self.server = Server.objects.create(hostname='localhost', secret='secret')
tokenHash = hashlib.sha1()
tokenHash.update("%s%s%s"%('localhost', 0, 'secret'))
self.token = "%s$%s$%s"%('localhost', 0, tokenHash.hexdigest())
def tearDown(self):
self.user.delete()
self.server.delete()
def testSessionStart(self):
resp = self.client.post('/api/session', {'hostname':self.server.hostname, 'player':self.user.minecraftprofile.mc_username, 'ip': '127.0.0.1'})
resp = self.client.post('/api/server/session/%s'%(self.user.minecraftprofile.mc_username), {'hostname':self.server.hostname, 'ip': '127.0.0.1'}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
self.assertEqual(resp.status_code, 200)
session = json.loads(resp.content)
sessionObj = PlayerSession.objects.get(id__exact=session['session'])
def testSessionEnd(self):
resp = self.client.post('/api/session', {'hostname':self.server.hostname, 'player':self.user.minecraftprofile.mc_username, 'ip': '127.0.0.1'})
resp = self.client.post('/api/server/session/%s'%(self.user.minecraftprofile.mc_username), {'hostname':self.server.hostname, 'ip': '127.0.0.1'}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
session = json.loads(resp.content)
resp = self.client.put('/api/session', {'session':session['session']})
resp = self.client.put('/api/server/session/%s'%(self.user.minecraftprofile.mc_username), {'session':session['session']}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
self.assertEqual(resp.status_code, 200)
sessionObj = PlayerSession.objects.get(id__exact=session['session'])
self.assertNotEqual(sessionObj.end, None)
class EconomyTest(unittest.TestCase):
def setUp(self):
self.client = Client()
self.user = User.objects.create_user('ValidUsername', 'test@example.com')
self.user.minecraftprofile.mc_username = "ValidUsername"
self.user.minecraftprofile.save()
self.user.minecraftprofile.currencyaccount.balance=42
self.user.minecraftprofile.currencyaccount.save()
self.server = Server.objects.create(hostname='localhost', secret='secret')
tokenHash = hashlib.sha1()
tokenHash.update("%s%s%s"%('localhost', 0, 'secret'))
self.token = "%s$%s$%s"%('localhost', 0, tokenHash.hexdigest())
def tearDown(self):
self.user.delete()
self.server.delete()
def testBalanceQuery(self):
resp = self.client.get('/api/server/economy/ValidUsername', HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
data = json.loads(resp.content)
self.assertEqual(data['balance'], 42)
def testDeposit(self):
resp = self.client.put('/api/server/economy/ValidUsername', {'delta': 100}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
data = json.loads(resp.content)
self.assertEqual(data['balance'], 142)
def testWithdraw(self):
resp = self.client.put('/api/server/economy/ValidUsername', {'delta': -40}, HTTP_AUTHORIZATION="X-Caminus %s"%(self.token))
data = json.loads(resp.content)
self.assertEqual(data['balance'], 2)

39
api/urls.py
View File

@@ -1,14 +1,49 @@
from django.conf.urls.defaults import patterns, include, url
from piston.resource import Resource
import handlers
from minecraft.models import Server
import hashlib
from django.http import HttpResponse
whitelistHandler = Resource(handlers.WhitelistHandler)
motdHandler = Resource(handlers.MOTDHandler)
class ServerAuther(object):
def is_authenticated(self, request):
authstring = request.META.get("HTTP_AUTHORIZATION", None)
if not authstring:
return False
authmeth, auth = authstring.split(' ', 1)
if not authmeth.lower() == 'x-caminus':
return False
serverName,salt,token = auth.split('$', 2)
try:
server = Server.objects.get(hostname=serverName)
except Server.DoesNotExist, e:
return False
tokenHash = hashlib.sha1()
tokenHash.update("%s%s%s"%(serverName, salt, server.secret))
if tokenHash.hexdigest() == token:
request.server = server
return True
return False
def challenge(self):
resp = HttpResponse("Authorization Required")
resp["WWW-Authenticate"] = 'X-Caminus realm=API'
resp.status_code = 401
return resp
class ServerResource(Resource):
def __init__(self, handler):
super(ServerResource, self).__init__(handler, ServerAuther())
urlpatterns = patterns('api',
url(r'^validate/(?P<username>.*)$', whitelistHandler),
url(r'^motd/(?P<username>.*)$', motdHandler),
url(r'^balance$', Resource(handlers.BalanceHandler)),
url(r'^server/(?P<hostname>.*)$', Resource(handlers.ServerHandler)),
url(r'^session$', Resource(handlers.PlayerSessionHandler)),
url(r'^server/whoami$', ServerResource(handlers.ServerPingHandler)),
url(r'^server/info/(?P<hostname>.*)$', Resource(handlers.ServerHandler)),
url(r'^server/economy/(?P<playername>.*)$', ServerResource(handlers.EconomyHandler)),
url(r'^server/session/(?P<playername>.*)$', ServerResource(handlers.PlayerSessionHandler)),
)

2
static/js/server-poll.js
View File

@@ -1,5 +1,5 @@
function updateServer() {
$.get("/api/server/dev.camin.us", function(data) {
$.get("/api/server/info/dev.camin.us", function(data) {
hours = parseInt((data['time']/1000)+8)%24;
minutes = parseInt(((data['time']/1000)%1)*60);
var day = hours < 12;