From 367f629894b65b964c6a655aef59b6567559e347 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Mon, 3 Sep 2012 22:47:57 +0200 Subject: [PATCH 1/7] stupid ua check --- app/controllers/ForumPost.scala | 2 +- app/controllers/ForumTopic.scala | 2 +- app/controllers/LilaController.scala | 11 +++++++++++ todo | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/controllers/ForumPost.scala b/app/controllers/ForumPost.scala index 61f4fa70ca..a96b18e2ad 100644 --- a/app/controllers/ForumPost.scala +++ b/app/controllers/ForumPost.scala @@ -23,7 +23,7 @@ object ForumPost extends LilaController with forum.Controller { case (categ, topic, posts) ⇒ forms.post.bindFromRequest.fold( err ⇒ BadRequest(html.forum.topic.show( categ, topic, posts, Some(err -> forms.captchaCreate))), - data ⇒ Firewall { + data ⇒ UAFirewall { val post = postApi.makePost(categ, topic, data).unsafePerformIO Redirect("%s#%d".format( routes.ForumTopic.show( diff --git a/app/controllers/ForumTopic.scala b/app/controllers/ForumTopic.scala index 9110d675d5..b1e87a7731 100644 --- a/app/controllers/ForumTopic.scala +++ b/app/controllers/ForumTopic.scala @@ -26,7 +26,7 @@ object ForumTopic extends LilaController with forum.Controller { IOptionResult(categRepo bySlug categSlug) { categ ⇒ forms.topic.bindFromRequest.fold( err ⇒ BadRequest(html.forum.topic.form(categ, err, forms.captchaCreate)), - data ⇒ Firewall { + data ⇒ UAFirewall { val topic = topicApi.makeTopic(categ, data).unsafePerformIO Redirect(routes.ForumTopic.show(categ.slug, topic.slug, 1)) } diff --git a/app/controllers/LilaController.scala b/app/controllers/LilaController.scala index a79e7910a9..ec16bd5a52 100644 --- a/app/controllers/LilaController.scala +++ b/app/controllers/LilaController.scala @@ -74,6 +74,17 @@ trait LilaController } ) + def UAFirewall[A <: Result](a: ⇒ A)(implicit ctx: Context): Result = Firewall { + val uas = List( + "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.89 Safari/537.1", + "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.89 Safari/537.1") + val ua = ctx.req.headers.get("User-Agent").|("?") + if (ctx.isAnon && uas.contains(ua.pp)) { + println("blocked " + ua) + Redirect(routes.Lobby.home()) + } else a + } + def JsonOk(map: Map[String, Any]) = Ok(toJson(map)) as JSON def JsonOk(list: List[Any]) = Ok(Json generate list) as JSON diff --git a/todo b/todo index 6f72f0b992..4ad1dc0e43 100644 --- a/todo +++ b/todo @@ -37,3 +37,4 @@ complete search engine using https://github.com/bsadeh/scalastic localize elo chart dates recognize tor IPs http://en.lichess.org/forum/staff/cheater-101#9 https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=37.59.32.99 weird UI clock bug (+30 minutes) http://en.lichess.org/forum/lichess-feedback/game-timer-is-30-minutes-incorrectly#4 +chess960 second rematch random position http://en.lichess.org/forum/lichess-feedback/return-game-chess-960#1 From 441ead7dfac64dc77fdb57cab5f744b3d90459ac Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Thu, 6 Sep 2012 01:51:15 +0200 Subject: [PATCH 2/7] nn "Norsk nynorsk" translation #489. Author: bjagus. nice with new norwegian language. Not everybody in norway are able to spell this correctly! --- conf/messages.nn | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/conf/messages.nn b/conf/messages.nn index 21e68f2918..1fca90f65d 100644 --- a/conf/messages.nn +++ b/conf/messages.nn @@ -37,12 +37,12 @@ whiteCreatesTheGame=Kvit har laga spelet blackCreatesTheGame=Svart har laga spelet whiteJoinsTheGame=Kvit hiv seg på spelet blackJoinsTheGame=Svart blir med i partiet -whiteResigned=Hvit har resignert -blackResigned=Sort ga opp +whiteResigned=Kvit gav opp +blackResigned=Svart ga opp whiteLeftTheGame=Kvit gjekk frå partiet blackLeftTheGame=Svart gjekk frå partiet shareThisUrlToLetSpectatorsSeeTheGame=Del denne lenka slik at andre kan sjå spelet -youAreViewingThisGameAsASpectator=Du observerer dette partiet som oskodar +youAreViewingThisGameAsASpectator=Du fylgjer dette partiet som oskodar replayAndAnalyse=Spel om att og analyser viewGameStats=Sjå statistikk flipBoard=Snu brettet @@ -58,6 +58,8 @@ viewAllNbGames=Sjå alle %s spela viewNbCheckmates=Sjå %s sjakkmatt nbBookmarks=%s Bokmerke nbPopularGames=%s Populære Spel +nbAnalysedGames=%s Analyserte spel +bookmarkedByNbPlayers=Bokmerka av %s spelarar viewInFullSize=Sjå i full storleik logOut=Logg ut signIn=Logg inn @@ -117,15 +119,22 @@ nbLosses=%s tap nbDraws=%s remis exportGames=Send parti color=Farge -giveNbSeconds=Gi %s sekund +eloRange=Elorating +giveNbSeconds=Gje %s sekund searchAPlayer=Søk etter ein spelar whoIsOnline=Kven er pålogga -allPlayers=Alle spelare -namedPlayers=Namngitte spelare +allPlayers=Alle spelarar +namedPlayers=Namngjeve spelarar premoveEnabledClickAnywhereToCancel=Førehandstrekk aktivert - klikk kor som helst for å avbryte thisPlayerUsesChessComputerAssistance=Denne spelaren brukar datahjelp opening=Opning takeback=Angre -proposeATakeback=Foreslå å angre -bookmarkThisGame=Bokmerke denne sida +proposeATakeback=Føreslå å gjera om trekket +takebackPropositionSent=Forslag om å gjera om trekket sendt +takebackPropositionDeclined=Forslag om å gjera om trekket avvist +takebackPropositionAccepted=Forslag om å gjera om trekket godteke +takebackPropositionCanceled=Forslag om å gjera om trekket annulert +yourOpponentProposesATakeback=Din motstandar føresleg å gjera om trekket +bookmarkThisGame=Bokmerk denne sida +toggleBackground=Skift bakgrunssfarge freeOnlineChessGamePlayChessNowInACleanInterfaceNoRegistrationNoAdsNoPluginRequiredPlayChessWithComputerFriendsOrRandomOpponents=Gratis nettsjakk. Spel sjakk på ei rein nettside. Inga påmelding, ikkje noko tillegg eller nedlastingar trengs. Spel mot ei maskin, vener eller tilfeldige motstandarar. From fe1ee2d4601038a7bfb8d8744fe5db8f3ff8bebd Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Thu, 6 Sep 2012 01:51:15 +0200 Subject: [PATCH 3/7] =?UTF-8?q?ro=20"rom=C3=A2n"=20translation=20#490.=20A?= =?UTF-8?q?uthor:=20Cristian=20Nastase.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/messages.ro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/messages.ro b/conf/messages.ro index cd9aa5ea82..001ef54095 100644 --- a/conf/messages.ro +++ b/conf/messages.ro @@ -58,7 +58,7 @@ viewAllNbGames=Vezi toate cele %s jocuri viewNbCheckmates=Vezi %s şah-mat-uri nbBookmarks=%s Semne de carte nbPopularGames=%s Jocuri interesante -nbAnalysedGames=Vezi %s maturi +nbAnalysedGames=Vezi %s jocuri analizate bookmarkedByNbPlayers=Marcat de %s jucatori viewInFullSize=Vezi pe tot ecranul logOut=Ieși @@ -67,7 +67,7 @@ signUp=Înregistrează-te people=Jucători games=Partide forum=Forum -chessPlayers=Jucători +chessPlayers=Jucători de sah minutesPerSide=Minute / jucător variant=Variantă timeControl=Ceas @@ -75,7 +75,7 @@ start=Start username=Utilizator password=Parolă haveAnAccount=Ai un cont? -allYouNeedIsAUsernameAndAPassword=Ai nevoie doar de numele utilizatorului și de o parolă. +allYouNeedIsAUsernameAndAPassword=Ai nevoie doar de un nume de utilizator și de o parolă. learnMoreAboutLichess=Află mai multe despre Lichess rank=Rang gamesPlayed=Partide jucate From 1828a1700111883c20b5ee97e512d37375bac695 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Thu, 6 Sep 2012 11:41:39 +0200 Subject: [PATCH 4/7] make netty listen only to 127.0.0.1 --- bin/lilarc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/lilarc b/bin/lilarc index e6283c7e25..68696d7d9c 100644 --- a/bin/lilarc +++ b/bin/lilarc @@ -1,7 +1,8 @@ #!/bin/sh HTTP_PORT=9000 -JVM_OPTIONS="-Dconfig.file=conf/local.conf -Dhttp.port=$HTTP_PORT" +HTTP_ADDRESS="127.0.0.1" +JVM_OPTIONS="-Dconfig.file=conf/local.conf -Dhttp.port=$HTTP_PORT -Dhttp.address=$HTTP_ADDRESS" LOG_FILE="logs/play.log" PROD_URL="http://en.lichess.org" From 858d7b2a952246f737fc3b4bf6205153c424802c Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Thu, 6 Sep 2012 11:42:19 +0200 Subject: [PATCH 5/7] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c0ba9a3736..59e2ba53a4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ serve/ serve/README target bin/.translate_version +data/ RUNNING_PID From dc5fe7bc2bfd40020b85752ae5045cc171dff1b6 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Thu, 6 Sep 2012 11:42:27 +0200 Subject: [PATCH 6/7] upgrade scalachess --- scalachess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scalachess b/scalachess index 5982e87bc5..6fc6095709 160000 --- a/scalachess +++ b/scalachess @@ -1 +1 @@ -Subproject commit 5982e87bc5ea73e44e79c54bea002a6fe216df0c +Subproject commit 6fc609570941db4840e7de7c810bb2fa957b4153 From 496ac2864eb16b2adb3de3d8fd31b04dad9e426c Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Thu, 6 Sep 2012 15:46:48 +0200 Subject: [PATCH 7/7] exclude more stuff from deployments --- bin/prod/rsync_exclude | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/prod/rsync_exclude b/bin/prod/rsync_exclude index f0d022f23a..8e4b08076b 100644 --- a/bin/prod/rsync_exclude +++ b/bin/prod/rsync_exclude @@ -6,6 +6,8 @@ project/project project/target target serve/ +data/ +play/repository/ RUNNING_PID .git* .ctags