[Finishes #103047632] Block assets in abusive projects by Bjvanminnen · Pull Request #4278 · code-dot-org/code-dot-org

Bjvanminnen · 2015-09-30T23:16:49Z

We want to make it so that when a project is marked as abusive, in addition to the project being blocked, any assets associated with that project are blocked (unless you are the owner, an admin, or a teacher of the owner). Furthermore, we want to do this without non-abusive projects needing to incur any additional cost.

We accomplish this by storing abuse_score as metadata on the asset. When a project is marked as abusive, we go through and mark all associated assets. Same thing when abuse is cleared by an admin. In addition, we block the user from adding assets to an abusive project. This is only enforced at the UI level rather than the API level

Testing

Student creates a project with assets in it
Anonymous user goes to share link and reports abuse.
Validate:

Anonymous user cannot view /view page or share page
Anonymous user gets 404 if they try to access asset directly
Teacher/admin/owner are all still able to access asset directly

Admin reset abuse
Validate:

Anonymous user can now see the project, and the asset if the navigate directly to it

Bjvanminnen · 2015-09-30T23:19:44Z

Done so that one doesn't spam zendesk while testing abuse reporting on localhost

I don't understand, how are you ensuring that tickets are not opened when running on localhost?

if Rails.env.development? we don't post to codeorg.zendesk.com (which creates the ticket)

davidsbailey · 2015-10-01T17:19:51Z

looking...

davidsbailey · 2015-10-01T18:02:35Z

in REST language, /v3/(assets|sources)/<channel-id> is a collection and a PUT to the collection should replace the entire collection. Because you are updating the entire collection based on the query param, I think the design you've chosen is nice and RESTful.

Nit: according to https://en.wikipedia.org/wiki/Representational_state_transfer, there should be a trailing slash (after <channel-id>) when updating a collection.

Yeah, I wasnt too sure about this. I am modifying the entire collection, but I'm not actually replacing it. i.e. I would think in most cases if you're doing a PUT to a resource you're providing the new resource in the body. I'm providing no body, and just modifying metadata. Thoughts?

Perhaps PATCH would be more accurate? http://restcookbook.com/HTTP%20Methods/patch/

davidsbailey · 2015-10-01T18:52:12Z

What happens if I remix an abusive app?

Bjvanminnen · 2015-10-01T18:55:31Z

You end up with a new project with an abuse_score of 0.

davidsbailey · 2015-10-01T18:58:04Z

OK. My vote would be for disallowing remix on projects which are marked as abusive, but that is a product question and you have more context than I do.

davidsbailey · 2015-10-01T18:59:24Z

LGTM after addressing inline comments

Bjvanminnen · 2015-10-01T19:01:03Z

For the time being it's by design that you can remix. This allows you to change any abusive comment, and reshare. If this becomes problematic, we can readdress.

Bjvanminnen · 2015-10-01T23:59:01Z

@davidsbailey could you take a peek at my latest commit? thanks for looking at this

davidsbailey · 2015-10-02T00:09:49Z

revert this put test helper?

davidsbailey · 2015-10-02T05:19:17Z

It's worth noting that varnish will currently strip the dashboard cookie off of GET requests to /v3/, unless this config block is updated in default.vcl.erb:

  # Always cache the following file types for all users.
  if ((req.url ~ "(?i)\.(cur|pdf|png|gif|jpeg|jpg|ico|mp3|swf|css|js)(\?[a-z0-9]+)?$") &&
      !(req.url ~ "^/api/") &&
      (req.request == "GET" || req.request == "HEAD")) {
    unset req.http.Cookie;
  }

davidsbailey · 2015-10-02T05:21:29Z

As a result, GET requests on individual, abusive assets would not be shown to admins or teachers.

Bjvanminnen · 2015-10-02T16:20:32Z

Nice find on the GET stuff. That's pretty unfortunate. I'm not too sure what the right fix is here, as disabling caching to enable this functionality seems non-ideal.

@philbogle Do you have any thoughts on this? Summary version is when requesting assets, we want to 404 if the asset is in a project marked as abusive, unless you're and admin, owner, or teacher of the owner. We think this will break as soon as we're behind varnish, since cookies will be stripped (and everyone will appear as non-owner).

davidsbailey · 2015-10-02T21:22:44Z

Per email chain with @wjordan -- this solution seems fine for now. Later, if we care about scaling to support wide sharing of a single app, we can create a new API endpoint which serves read-only assets (GET requests only) and rejects requests for abusive assets. We can point most users to the read-only, cookieless API and point admins and teachers to the original, cookied API.

[Finishes #103047632] Block assets in abusive projects

commit 534bad3 Merge: b0cef5a e6e5220 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 14:31:28 2015 -0700 Merge pull request #4278 from code-dot-org/abusedAssets [Finishes #103047632] Block assets in abusive projects commit b0cef5a Merge: 5d00c24 f26dd55 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 14:06:56 2015 -0700 Merge pull request #4312 from code-dot-org/permissions Add teacher permissions to special events commit 5d00c24 Merge: 26ccaac 419c186 Author: Will Jordan <wjordan@users.noreply.github.com> Date: Fri Oct 2 14:04:55 2015 -0700 Merge pull request #4301 from code-dot-org/varnish_hostname Match (dashboard|studio).code.org hostnames to dashboard in Varnish config commit 26ccaac Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 20:54:05 2015 +0000 Automatically built. commit d08b2ca Merge: 6a6abde 2ebef3a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 13:40:36 2015 -0700 Merge pull request #4297 from code-dot-org/oneReact [Finishes #102389490] single react commit 6a6abde Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 20:40:07 2015 +0000 Automatically built. commit 85041b3 Merge: 7376e38 6d2c4c4 Author: Brad Buchanan <bradley.c.buchanan@gmail.com> Date: Fri Oct 2 13:39:28 2015 -0700 Merge pull request #4184 from code-dot-org/applab-google-charts Applab: Google charts integration commit 7376e38 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 20:38:32 2015 +0000 dropbox and gsheet changes commit f97e84c Merge: 5da36f9 a2f7980 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:32:11 2015 -0700 Merge pull request #4315 from code-dot-org/revert-4309-companies Revert "Change orgs to companies" commit a2f7980 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:32:01 2015 -0700 Revert "Change orgs to companies" commit 5da36f9 Merge: d9f3f9b 7cd8a05 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:29:16 2015 -0700 Merge pull request #4309 from code-dot-org/companies Change orgs to companies commit d9f3f9b Merge: 06a424d 337c614 Author: Josh Lory <josh.lory@code.org> Date: Fri Oct 2 13:20:11 2015 -0700 Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings Fix rubocop parser warnings commit 06a424d Merge: 6cf948f ef90eed Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 13:08:29 2015 -0700 Merge pull request #4314 from code-dot-org/eslint get lint in dashboard passing again commit ef90eed Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 12:52:16 2015 -0700 get lint in dashboard passing again commit 6cf948f Merge: 077e25f 351d29b Author: ashercodeorg <asher@code.org> Date: Fri Oct 2 14:35:29 2015 -0500 Merge pull request #4303 from code-dot-org/fixPosteErrors Checks whether header is nil before looking up the litmus_tracking_id_key. commit 351d29b Author: Asher Kach <asher@code.org> Date: Fri Oct 2 14:34:06 2015 -0500 Adds the tracking bug URL to the TODO(andrew) in deliver_poste_messages. commit 077e25f Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 12:27:14 2015 -0700 disable dashboard linting until fixed commit 1061e95 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 19:12:10 2015 +0000 Automatically built. commit d815b63 Merge: 9699e34 d49c7b9 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 12:07:04 2015 -0700 Merge pull request #4288 from code-dot-org/eslint [Finishes #104348304] linting in dashboard commit 9699e34 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:23:20 2015 +0000 Update the level used for auto open function editor eyes test. commit 05877e4 Merge: ae5b9bb 03e36de Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri Oct 2 11:21:15 2015 -0700 Merge pull request #4313 from code-dot-org/levelbuilder levelbuilder -> staging (one change) commit d49c7b9 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 11:20:34 2015 -0700 lint all javascripts in dashboard/apps commit 03e36de Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:20:02 2015 +0000 Add level that auto opens function editor to /s/allthethings commit 3db7565 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 10:57:46 2015 -0700 remove $ from global list at the top of a bunch of files commit ae5b9bb Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 17:01:53 2015 +0000 content changes -trevor commit 4f4e310 Merge: c459711 4ada13c Author: Trevor Berg <trevor@code.org> Date: Fri Oct 2 09:55:08 2015 -0700 Merge pull request #4307 from code-dot-org/levelbuilder Levelbuilder -> Staging commit 4ada13c Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 16:54:05 2015 +0000 levelbuilder changes -trevor commit 5c01e57 Merge: 3e96865 c459711 Author: Trevor Berg <trevor@code.org> Date: Fri Oct 2 09:48:52 2015 -0700 Merge pull request #4306 from code-dot-org/staging Levelbuilder -> Staging commit 3e96865 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 16:48:00 2015 +0000 levelbuilder changes -Trevor commit 2db4d53 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 19:08:07 2015 +0000 Automatically built. commit d815b63 Merge: 9699e34 d49c7b9 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 12:07:04 2015 -0700 Merge pull request #4288 from code-dot-org/eslint [Finishes #104348304] linting in dashboard commit 9699e34 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:23:20 2015 +0000 Update the level used for auto open function editor eyes test. commit 05877e4 Merge: ae5b9bb 03e36de Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri Oct 2 11:21:15 2015 -0700 Merge pull request #4313 from code-dot-org/levelbuilder levelbuilder -> staging (one change) commit d49c7b9 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 11:20:34 2015 -0700 lint all javascripts in dashboard/apps commit 03e36de Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:20:02 2015 +0000 Add level that auto opens function editor to /s/allthethings commit 3db7565 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 10:57:46 2015 -0700 remove $ from global list at the top of a bunch of files commit ae5b9bb Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 17:01:53 2015 +0000 content changes -trevor commit 4f4e310 Merge: c459711 4ada13c Author: Trevor Berg <trevor@code.org> Date: Fri Oct 2 09:55:08 2015 -0700 Merge pull request #4307 from code-dot-org/levelbuilder Levelbuilder -> Staging commit 4ada13c Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 16:54:05 2015 +0000 levelbuilder changes -trevor commit 5c01e57 Merge: 3e96865 c459711 Author: Trevor Berg <trevor@code.org> Date: Fri Oct 2 09:48:52 2015 -0700 Merge pull request #4306 from code-dot-org/staging Levelbuilder -> Staging commit 3e96865 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 16:48:00 2015 +0000 levelbuilder changes -Trevor commit f948c38 Merge: 7822c7f d815b63 Author: Asher Kach <asher@code.org> Date: Fri Oct 2 14:07:32 2015 -0500 Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into fixPosteErrors commit d815b63 Merge: 9699e34 d49c7b9 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 12:07:04 2015 -0700 Merge pull request #4288 from code-dot-org/eslint [Finishes #104348304] linting in dashboard commit 7822c7f Author: Asher Kach <asher@code.org> Date: Fri Oct 2 13:54:14 2015 -0500 Adds a TODO(andrew) to surface a signal how often we are not seeing a tracking ID. commit dd3472f Author: Asher Kach <asher@code.org> Date: Thu Oct 1 20:36:17 2015 -0500 Checks whether header is nil before looking up the litmus_tracking_id key. The intent is to eliminate the plethora of error messages being seen in the Staging Room. commit 9699e34 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:23:20 2015 +0000 Update the level used for auto open function editor eyes test. commit 7cd8a05 Author: caleybrock <caleybrock7@gmail.com> Date: Fri Oct 2 11:23:11 2015 -0700 change title commit 05877e4 Merge: ae5b9bb 03e36de Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri Oct 2 11:21:15 2015 -0700 Merge pull request #4313 from code-dot-org/levelbuilder levelbuilder -> staging (one change) commit d49c7b9 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 11:20:34 2015 -0700 lint all javascripts in dashboard/apps commit 03e36de Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:20:02 2015 +0000 Add level that auto opens function editor to /s/allthethings commit d08b2ca Merge: 6a6abde 2ebef3a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 13:40:36 2015 -0700 Merge pull request #4297 from code-dot-org/oneReact [Finishes #102389490] single react commit 6a6abde Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 20:40:07 2015 +0000 Automatically built. commit 85041b3 Merge: 7376e38 6d2c4c4 Author: Brad Buchanan <bradley.c.buchanan@gmail.com> Date: Fri Oct 2 13:39:28 2015 -0700 Merge pull request #4184 from code-dot-org/applab-google-charts Applab: Google charts integration commit 7376e38 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 20:38:32 2015 +0000 dropbox and gsheet changes commit f97e84c Merge: 5da36f9 a2f7980 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:32:11 2015 -0700 Merge pull request #4315 from code-dot-org/revert-4309-companies Revert "Change orgs to companies" commit a2f7980 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:32:01 2015 -0700 Revert "Change orgs to companies" commit 5da36f9 Merge: d9f3f9b 7cd8a05 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:29:16 2015 -0700 Merge pull request #4309 from code-dot-org/companies Change orgs to companies commit d9f3f9b Merge: 06a424d 337c614 Author: Josh Lory <josh.lory@code.org> Date: Fri Oct 2 13:20:11 2015 -0700 Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings Fix rubocop parser warnings commit 06a424d Merge: 6cf948f ef90eed Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 13:08:29 2015 -0700 Merge pull request #4314 from code-dot-org/eslint get lint in dashboard passing again commit ef90eed Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 12:52:16 2015 -0700 get lint in dashboard passing again commit 6cf948f Merge: 077e25f 351d29b Author: ashercodeorg <asher@code.org> Date: Fri Oct 2 14:35:29 2015 -0500 Merge pull request #4303 from code-dot-org/fixPosteErrors Checks whether header is nil before looking up the litmus_tracking_id_key. commit 351d29b Author: Asher Kach <asher@code.org> Date: Fri Oct 2 14:34:06 2015 -0500 Adds the tracking bug URL to the TODO(andrew) in deliver_poste_messages. commit 077e25f Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 12:27:14 2015 -0700 disable dashboard linting until fixed commit 1061e95 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 19:12:10 2015 +0000 Automatically built. commit d815b63 Merge: 9699e34 d49c7b9 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 12:07:04 2015 -0700 Merge pull request #4288 from code-dot-org/eslint [Finishes #104348304] linting in dashboard commit 9699e34 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:23:20 2015 +0000 Update the level used for auto open function editor eyes test. commit 05877e4 Merge: ae5b9bb 03e36de Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri Oct 2 11:21:15 2015 -0700 Merge pull request #4313 from code-dot-org/levelbuilder levelbuilder -> staging (one change) commit d49c7b9 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 11:20:34 2015 -0700 lint all javascripts in dashboard/apps commit 03e36de Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:20:02 2015 +0000 Add level that auto opens function editor to /s/allthethings commit 3db7565 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 10:57:46 2015 -0700 remove $ from global list at the top of a bunch of files commit ae5b9bb Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 17:01:53 2015 +0000 content changes -trevor commit 4f4e310 Merge: c459711 4ada13c Author: Trevor Berg <trevor@code.org> Date: Fri Oct 2 09:55:08 2015 -0700 Merge pull request #4307 from code-dot-org/levelbuilder Levelbuilder -> Staging commit 4ada13c Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 16:54:05 2015 +0000 levelbuilder changes -trevor commit 5c01e57 Merge: 3e96865 c459711 Author: Trevor Berg <trevor@code.org> Date: Fri Oct 2 09:48:52 2015 -0700 Merge pull request #4306 from code-dot-org/staging Levelbuilder -> Staging commit 3e96865 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 16:48:00 2015 +0000 levelbuilder changes -Trevor commit 2db4d53 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 19:08:07 2015 +0000 Automatically built. commit d815b63 Merge: 9699e34 d49c7b9 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 12:07:04 2015 -0700 Merge pull request #4288 from code-dot-org/eslint [Finishes #104348304] linting in dashboard commit 9699e34 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:23:20 2015 +0000 Update the level used for auto open function editor eyes test. commit 05877e4 Merge: ae5b9bb 03e36de Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri Oct 2 11:21:15 2015 -0700 Merge pull request #4313 from code-dot-org/levelbuilder levelbuilder -> staging (one change) commit d49c7b9 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 11:20:34 2015 -0700 lint all javascripts in dashboard/apps commit 03e36de Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:20:02 2015 +0000 Add level that auto opens function editor to /s/allthethings commit 3db7565 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 10:57:46 2015 -0700 remove $ from global list at the top of a bunch of files commit ae5b9bb Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 17:01:53 2015 +0000 content changes -trevor commit 4f4e310 Merge: c459711 4ada13c Author: Trevor Berg <trevor@code.org> Date: Fri Oct 2 09:55:08 2015 -0700 Merge pull request #4307 from code-dot-org/levelbuilder Levelbuilder -> Staging commit 4ada13c Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 16:54:05 2015 +0000 levelbuilder changes -trevor commit 5c01e57 Merge: 3e96865 c459711 Author: Trevor Berg <trevor@code.org> Date: Fri Oct 2 09:48:52 2015 -0700 Merge pull request #4306 from code-dot-org/staging Levelbuilder -> Staging commit 3e96865 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 16:48:00 2015 +0000 levelbuilder changes -Trevor commit f948c38 Merge: 7822c7f d815b63 Author: Asher Kach <asher@code.org> Date: Fri Oct 2 14:07:32 2015 -0500 Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into fixPosteErrors commit d815b63 Merge: 9699e34 d49c7b9 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Fri Oct 2 12:07:04 2015 -0700 Merge pull request #4288 from code-dot-org/eslint [Finishes #104348304] linting in dashboard commit 7822c7f Author: Asher Kach <asher@code.org> Date: Fri Oct 2 13:54:14 2015 -0500 Adds a TODO(andrew) to surface a signal how often we are not seeing a tracking ID. commit dd3472f Author: Asher Kach <asher@code.org> Date: Thu Oct 1 20:36:17 2015 -0500 Checks whether header is nil before looking up the litmus_tracking_id key. The intent is to eliminate the plethora of error messages being seen in the Staging Room. commit 9699e34 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:23:20 2015 +0000 Update the level used for auto open function editor eyes test. commit 7cd8a05 Author: caleybrock <caleybrock7@gmail.com> Date: Fri Oct 2 11:23:11 2015 -0700 change title commit 05877e4 Merge: ae5b9bb 03e36de Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri Oct 2 11:21:15 2015 -0700 Merge pull request #4313 from code-dot-org/levelbuilder levelbuilder -> staging (one change) commit d49c7b9 Author: Brent Van Minnen <bjvanminnen@gmail.com> Date: Fri Oct 2 11:20:34 2015 -0700 lint all javascripts in dashboard/apps commit 03e36de Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 18:20:02 2015 +0000 Add level that auto opens function editor to /s/allthethings commit 85041b3 Merge: 7376e38 6d2c4c4 Author: Brad Buchanan <bradley.c.buchanan@gmail.com> Date: Fri Oct 2 13:39:28 2015 -0700 Merge pull request #4184 from code-dot-org/applab-google-charts Applab: Google charts integration commit 7376e38 Author: Continuous Integration <dev@code.org> Date: Fri Oct 2 20:38:32 2015 +0000 dropbox and gsheet changes commit f97e84c Merge: 5da36f9 a2f7980 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:32:11 2015 -0700 Merge pull request #4315 from code-dot-org/revert-4309-companies Revert "Change orgs to companies" commit a2f7980 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:32:01 2015 -0700 Revert "Change orgs to companies" commit 5da36f9 Merge: d9f3f9b 7cd8a05 Author: Caley Brock <caleybrock7@gmail.com> Date: Fri Oct 2 13:29:16 2015 -0700 Merge pull request #4309 from code-dot-org/companies Change orgs to companies commit d9f3f9b Merge: 06a424d 337c614 Author: Josh Lory <josh.lory@code.org> Date: Fri Oct 2 13:20:11 2015 -0700 Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings Fix rubocop parser warnings

Bjvanminnen reviewed Sep 30, 2015
View reviewed changes

Bjvanminnen assigned davidsbailey Sep 30, 2015

davidsbailey reviewed Oct 1, 2015
View reviewed changes

davidsbailey reviewed Oct 2, 2015
View reviewed changes

Comment thread shared/test/test_assets.rb Outdated

davidsbailey Oct 2, 2015

Copy link
Copy Markdown

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this put test helper?

Bjvanminnen added 11 commits October 2, 2015 11:28

prevent gets of abusive assets

34b2cc8

abusive asset flow works

c98d5e3

error for uploads disabled

13bc1d7

use snake_case on the server

770c8d4

better tests

717b162

more improved tests

85393d7

small test/fix

c3f91cb

move helper

f5fa3f4

patch instead of put and other code review feedback

9c54274

more cleanup after code review feedback

9af8e6a

dont trash cookies for requests to v3/assets

e6e5220

Bjvanminnen force-pushed the abusedAssets branch from e745868 to e6e5220 Compare October 2, 2015 18:53

wjordan mentioned this pull request Oct 2, 2015

Match (dashboard|studio).code.org hostnames to dashboard in Varnish config #4301

Merged

Bjvanminnen added a commit that referenced this pull request Oct 2, 2015

Merge pull request #4278 from code-dot-org/abusedAssets

534bad3

[Finishes #103047632] Block assets in abusive projects

Bjvanminnen merged commit 534bad3 into staging Oct 2, 2015

Bjvanminnen deleted the abusedAssets branch October 2, 2015 21:31

Uh oh!

Conversation

Bjvanminnen commented Sep 30, 2015

Testing

Uh oh!

Bjvanminnen Sep 30, 2015

Choose a reason for hiding this comment

Uh oh!

davidsbailey Oct 1, 2015

Choose a reason for hiding this comment

Uh oh!

Bjvanminnen Oct 1, 2015

Choose a reason for hiding this comment

Uh oh!

davidsbailey commented Oct 1, 2015

Uh oh!

davidsbailey Oct 1, 2015

Choose a reason for hiding this comment

Uh oh!

Bjvanminnen Oct 1, 2015

Choose a reason for hiding this comment

Uh oh!

davidsbailey Oct 1, 2015

Choose a reason for hiding this comment

Uh oh!

davidsbailey commented Oct 1, 2015

Uh oh!

Bjvanminnen commented Oct 1, 2015

Uh oh!

davidsbailey commented Oct 1, 2015

Uh oh!

davidsbailey commented Oct 1, 2015

Uh oh!

Bjvanminnen commented Oct 1, 2015

Uh oh!

Bjvanminnen commented Oct 1, 2015

Uh oh!

davidsbailey Oct 2, 2015

Choose a reason for hiding this comment

Uh oh!

davidsbailey commented Oct 2, 2015

Uh oh!

davidsbailey commented Oct 2, 2015

Uh oh!

Bjvanminnen commented Oct 2, 2015

Uh oh!

davidsbailey commented Oct 2, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants