[Commits] [wesnoth/wesnoth] 7a9b39: campaignd: Tiny variable refactoring

[GitHub]

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 7a9b39f9bc31fa39bfc6d2dfe23417b2b697fe4a
      https://github.com/wesnoth/wesnoth/commit/7a9b39f9bc31fa39bfc6d2dfe23417b2b697fe4a
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M src/campaign_server/campaign_server.cpp

  Log Message:
  -----------
  campaignd: Tiny variable refactoring


  Commit: cfb548b241a7044cf7c9524fc5c1ef9a5b12fd7e
      https://github.com/wesnoth/wesnoth/commit/cfb548b241a7044cf7c9524fc5c1ef9a5b12fd7e
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M changelog
    M src/CMakeLists.txt
    M src/SConscript
    A src/campaign_server/blacklist.cpp
    A src/campaign_server/blacklist.hpp
    M src/campaign_server/campaign_server.cpp

  Log Message:
  -----------
  campaignd: Quick-and-dirty implementation of upload-time blacklisting

A path to a blacklist WML file may be provided in the campaignd
configuration file (server.cfg). The BL file, in turn, may contain
attributes for comma-delimited lists of wildcard patterns, accepting
shell-style '*' and '?', by leveraging utils::wildcard_string_match()'s
functionality.

The following lists of patterns are recognized at this time:

  ip=<numeric IPv4 address masks>
  email=<add-on author email masks>
  name=<add-on id/name masks>
  title=<add-on title masks>
  author=<add-on author masks>
  description=<add-on description masks>

Currently, the IP address mask list also takes '*' and '?' wildcards. My
intention is to use CIDR subnet masks instead of or in addition to this.

The blacklist WML file is only read by campaignd once at startup and
it's never written to, thus allowing to preserve any WML comment lines
that may be included in the file by admins for convenience.

The IP, email, name, title, author, and description of a (new or
existing) uploaded add-on are matched against the blacklist in that
order. If the add-on matches, the upload is aborted and the user is
shown a generic message in English, just like with every other possible
campaignd-side error (on the plus side, this means it can be backported
to 1.12).

All matches (except for IP matches, which only contain digits and
punctuation) are done case-insensitively.

Because of campaignd protocol limitations, the upload is only checked
and aborted after the client has already uploaded a weighty WML document
including the add-on archive. Such is life, I guess.


  Commit: fc1da06c76c64bb4364322c95f21ddaf5d89e30a
      https://github.com/wesnoth/wesnoth/commit/fc1da06c76c64bb4364322c95f21ddaf5d89e30a
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M src/campaign_server/blacklist.hpp

  Log Message:
  -----------
  campaignd: Forgot to add a Doxygen comment to the last commit


  Commit: fd143aa53d4f14b6e574d9c23c7d714153ee024a
      https://github.com/wesnoth/wesnoth/commit/fd143aa53d4f14b6e574d9c23c7d714153ee024a
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M src/tests/test_serialization.cpp

  Log Message:
  -----------
  Add test cases for utils::wildcard_string_match()


  Commit: 0679ded2f1e78fc749d2bed9a7eeb94e7eff171d
      https://github.com/wesnoth/wesnoth/commit/0679ded2f1e78fc749d2bed9a7eeb94e7eff171d
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M src/tests/test_serialization.cpp

  Log Message:
  -----------
  Test a few counterintuitive wildcard_string_match() border cases

It's probably best to leave them alone for now, though.


  Commit: 7b1be3440ca81960846710ce89b392e6c3b27f24
      https://github.com/wesnoth/wesnoth/commit/7b1be3440ca81960846710ce89b392e6c3b27f24
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M src/campaign_server/campaign_server.cpp

  Log Message:
  -----------
  campaignd: Remove dead code


  Commit: cd2f8ccd0ca7582275bc732efab1c4330474d5ed
      https://github.com/wesnoth/wesnoth/commit/cd2f8ccd0ca7582275bc732efab1c4330474d5ed
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M changelog
    M src/CMakeLists.txt
    M src/SConscript
    A src/campaign_server/blacklist.cpp
    A src/campaign_server/blacklist.hpp
    M src/campaign_server/campaign_server.cpp
    M src/tests/test_serialization.cpp

  Log Message:
  -----------
  Merge branch 'backport/1.12/campaignd-blacklist' into 1.12


Compare: https://github.com/wesnoth/wesnoth/compare/6a2c1a04e638...cd2f8ccd0ca7