Commit graph

5056 commits

Author SHA1 Message Date
Lucas Nicodemus
305fa2c594
Merge branch 'general-devel' into general-devel 2021-05-23 13:12:29 -07:00
Lucas Nicodemus
8611742286 Switch to entirely new action for changelog check
Look, let's just be real here: GitHub needs to redo the entire
permission model for GitHub. There is no way to create a secure
combination of the following elements: post comment, edit comment, and
post status check.

If you want to be able to post comments, you have to authorize a token
or app to have full authority to do literally anything that the user can
do on a public repo. Full stop.

If you want to post a status check, you have to give the user write
access to the entire repo, which makes the first issue a problem.

You can't just explicitly make a token that says "only allow this user
to post and edit its own comments" and "allow this user to post status
checks" because write access on the repo implies authority over all
other issues/PRs opened by other people.

Now Cardinal's token is restricted to just status checks, and we're
using a different action.

Thanks a ton for the huge mess Github.
2021-05-23 13:06:06 -07:00
Lucas Nicodemus
613afc1d75 Use Cardinal for danger CI
This change uses Cardinal's PAT for GitHub Actions CI. The way this
works is very convoluted, but it makes sense in theory.

1. Cardinal is a member of the Pryaxis org, in a group called "untrusted
   robots." She has write access to Pryaxis/TShock, so she can create
status messages. This is because GitHub only allows status messages to
be created if a user has write access.

2. Cardinal has a PAT, and that PAT only has access to creating
   repository status messages.

3. Danger requires permission to post comments and update CI status.

4. Cardinal's PAT is only authorized to create repo status messages, and
   cannot privilege escalate.

5. GitHub implicitly gives everyone the ability to post comments on
   public repositories.

Thus, this really interesting and weird flow should mean that Cardinal
can post comments and update status messages, by having write access but
functionally being unable to use it.

At least, that's the theory.
2021-05-23 12:23:08 -07:00
Quinci135
5581bf5e45 Fix torchflags
UsingBiomeTorches: Whether or not the player has the torchgod biometorches ability enabled
HappyFunTorchTime: Whether or not the player has fought the torchgod before (for logic that checks for torchgod spawning)
unlockedBiomeTorches: Whether or not the player has the torchgod biome torches ability unlocked
2021-05-23 04:48:01 -07:00
Lucas Nicodemus
6856c867dd Use correct value to read usingBiomeTorches in GDH
This fixes a ridiculous typo in GetDataHandlers where we were setting
the UsingBiomeTorches flag based on having unlocked biome torches,
rather than actually being used. Thanks to @Arthri for the tip!
2021-05-23 03:21:56 -07:00
Lucas Nicodemus
7dde56e6da
Update danger to run on pull_request_target
pull_request_target runs in the context of the base repo, which should allow Danger to be able to comment on things from outside the repo: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request_target
2021-05-22 21:56:36 -07:00
Lucas Nicodemus
b8b27277e9
Add recent collaborators to sponsors file 2021-05-22 11:16:41 -07:00
Lucas Nicodemus
914cdb1046
Merge pull request from GHSA-q776-cv3j-4q6m
Patch SendTileRectangle mass-griefing exploit
2021-05-22 10:55:31 -07:00
Lucas Nicodemus
9ff3036469 Version tick: 4.5.3 2021-05-22 10:54:47 -07:00
quake1337
02b4bf7973
Update CHANGELOG.md
Address @hakusaro's suggestion for the changelog.

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2021-05-21 14:18:28 +02:00
quake1337
b1820c1516 Fix spaces lol 2021-05-21 13:54:40 +02:00
quake1337
817dfe26fc Address feedback from @hakusaro about style & documentation 2021-05-21 13:13:06 +02:00
quake1337
658c714ac5 Remove old UpdateServerTileState call, as the new one supersedes it 2021-05-21 12:13:06 +02:00
quake1337
0cad24abf7 Merge branch 'advisory-fix-1' of github.com:Pryaxis/TShock-ghsa-q776-cv3j-4q6m into advisory-fix-1 2021-05-21 12:00:03 +02:00
quake1337
ccf5a422ff Update CHANGELOG.md 2021-05-21 11:58:33 +02:00
quake1337
383052cb5e
Merge branch 'general-devel' into advisory-fix-1 2021-05-21 10:39:01 +02:00
Lucas Nicodemus
68ae73ffef Warn players if bypass SSC permission is enabled
If a player has the tshock.ignore.ssc permission, odds are that they may
want to know that their data isn't being saved or not. This change
allows users to be notified if they have SSC data stored in the DB but
they aren't having it loaded due to the aforementioned permission.

This permission causes great confusion, but we can't really change it
because we would break existing setups. This is an easy change that
gives people a reason why they suddenly "have no items."

This new option can be turned off in the config file for SSC if it's not
desired.

This change also modifies some of the log messages so that it's clear
why the SSC save didn't occur for a given player.
2021-05-21 01:16:04 -07:00
quake1337
c6dad11a1c Initial patch for advisory-1.
- Remove unused fields from NetTile
- Apply data from packets selectively based on approving context.
2021-05-21 09:53:33 +02:00
Lucas Nicodemus
c9b13b493e Merge branch 'general-devel' of github.com:Pryaxis/TShock into general-devel 2021-05-20 03:32:24 -07:00
Lucas Nicodemus
39147355c1 Automatically back up the world by default
Backups run every 10 minutes for up to 4 hours of backups to prevent
against accidental data loss.
2021-05-20 03:31:37 -07:00
Lucas Nicodemus
44c6b69fdc
Remove ref to travis builds & add video to readme 2021-05-20 02:54:27 -07:00
Lucas Nicodemus
544ba45f50
Merge pull request #2300 from moisterrific/patch-21
Change max buff limit from short to int
2021-05-20 02:40:09 -07:00
Lucas Nicodemus
4e4294f497
Merge pull request #2307 from moisterrific/patch-22
minor improvement to stock MOTD behavior
2021-05-20 02:39:48 -07:00
Lucas Nicodemus
d7bc4fdbda Add Danger CI check for changelog entries
This commit adds Danger via GitHub Actions. Dangerfiles are ruby files
that have a DSL for interacting with GitHub. They can do arbitrary
things. See: https://danger.systems/reference.html

The point of this commit is to automate the process of asking people to
update the changelog. This is a really really annoying thing that we
have to do too often. Editing a pull request will automatically re-run
the check.

Truly trivial commits can be marked as trivial easily by using the
hashtag trivial in the PR body. This is really just useful for actually
trivial things. Most commits actually do need to have associated
changelog entries.
2021-05-20 02:33:37 -07:00
Lucas Nicodemus
91bf525a4a
Add upcoming buff changes to changelog 2021-05-20 01:58:37 -07:00
Lucas Nicodemus
94939bc050
Merge branch 'general-devel' into patch-21 2021-05-20 01:57:39 -07:00
Lucas Nicodemus
e5ffbfde91
Add command specifier support in motd to changelog 2021-05-20 01:54:33 -07:00
Lucas Nicodemus
38c070ad03
Update changelog with upcoming MOTD changes 2021-05-20 01:53:25 -07:00
Lucas Nicodemus
7d5901c350
Merge branch 'general-devel' into patch-22 2021-05-20 01:52:35 -07:00
Lucas Nicodemus
465537b424
Update changelog with log changes from @QuiCM 2021-05-20 01:50:28 -07:00
Lucas Nicodemus
a3b98b5406
Merge pull request #2306 from Pryaxis/logs
Change logpath to `./tshock/logs` by default
2021-05-20 01:49:10 -07:00
Lucas Nicodemus
619c3d4f75 Rename TSAPI to TSAPI in git submodule file
For the purposes of making it easier to understand, the Terraria Server
API is now being called "TShock Scaffold API." This is actually just an
elaborate measure so that TSAPI can be called TSAPI but to alleviate
some confusion.
2021-05-19 23:58:07 -07:00
Lucas Nicodemus
154456bbb5 Update submodule for TSAPI to fix #2304 2021-05-19 23:51:34 -07:00
Chris
6fee39ed68
Merge branch 'general-devel' into patch-22 2021-05-19 17:43:17 +09:30
Lucas Nicodemus
439dc6a0eb
Merge pull request #2314 from moisterrific/patch-25
Add tele potion and conch perms to default
2021-05-18 23:22:09 -07:00
Chris
4b3125b8db
Merge branch 'general-devel' into patch-25 2021-05-19 15:50:05 +09:30
Lucas Nicodemus
d82db22e5d Tick submodule for 1.4.2.3 2021-05-16 19:17:51 -07:00
stacey
62d15cf445
Add tele potion and conch perms to default 2021-05-16 20:57:26 -04:00
stacey
a1ddea4f59
Update /gbuff with the same changes
totally forgot this existed
2021-05-14 13:44:37 -04:00
stacey
a2804b6c89
Update how it looks 2021-05-14 13:23:42 -04:00
stacey
a9e8cd7ca5
update default motd to use %specifier 2021-05-14 13:00:56 -04:00
stacey
e0c9f45038
Add %specifier% to SendFileTextAsMessage 2021-05-14 12:58:16 -04:00
Chris
b754f142a1 Change logpath to ./tshock/logs by default 2021-05-14 22:08:32 +09:30
stacey
44d7bf04f8
Merge branch 'general-devel' into patch-21 2021-05-14 07:51:12 -04:00
Chris
356cdaa7ad
Merge pull request #2299 from moisterrific/patch-20
Update HealOtherPlayer check to respect ignoredamagecap permission
2021-05-13 17:43:34 +09:30
stacey
d2a0a539f4
fix error msg 2021-05-12 22:08:10 -04:00
stacey
306e4d1ab4
fix typo
sigh
2021-05-12 21:45:06 -04:00
stacey
dacc20e9c3
Update buff command HelpText
More properly explain the command functionality
2021-05-12 21:40:44 -04:00
stacey
68c650f4fa
More minor fixes
Reverted default (when no duration is specified) buff duration to 60s, added formula instead of hard coding max duration as per Quake's recommendation, made error message more self-explanatory
2021-05-12 21:36:26 -04:00
stacey
0eadfaba52
Minor fixes 2021-05-12 15:48:38 -04:00