Commit Graph

479 Commits

Author SHA1 Message Date
Brian Palmer 9aad6b193f fix safefiles not setting session permissions properly
The specs didn't catch this because our user_session spec helper stubs
out PseudonymSession, so you'll have the user session available even if
you make a request to a different domain name, so the normal user
permissions were being applied. I've upgraded the specs to make sure
that the user isn't getting logged in on the safefiles
request.

Change-Id: I01b64a87bb51fbf2e947f5c2a1ae5471d1f1e216
Reviewed-on: https://gerrit.instructure.com/5244
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-08-24 15:17:20 -06:00
Bryan Madsen 01a7fcc2fd added and modified selenium tests to include sales demo user interactions
Change-Id: I6be0694d62ca904358b2de9b2792b4d3ada90018
Reviewed-on: https://gerrit.instructure.com/4932
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
2011-08-24 11:16:16 -06:00
Cody Cutrer 4db7bbad10 cinch up admin permissions wrt stuff available in the accounts section
Refs #4952

 * Fix saving role overrides for Site Admin account roles
 * Add the following permissions:
   * read_course_list (for listing or searching courses)
   * view_statistics (for viewing account statistics)
   * manage_user_notes (instead of being implied-ish by read_reports)
 * Hide UI elements that provide access to features that are not
   allowed
 * Remove lots of not applicable stuff from Site Admin settings

Change-Id: I7414368b472ba655d04118db30c1bb46542deb37
Reviewed-on: https://gerrit.instructure.com/5054
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-08-16 08:17:55 -06:00
JT Olds 40973e156d support http basic auth for grade exchange
Change-Id: Ie61bc71ee82bc3c019dd25a9b58e7ff13aa44f54
Reviewed-on: https://gerrit.instructure.com/5049
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-11 12:37:39 -06:00
Cody Cutrer 80907b4dd5 fixes #4983 conferences for groups
* Add conference_close route for group conferences
 * Pull *group* conferences, not the group's context's conferences
   when showing the groups' feed
 * Add the conferences tab (where appropriate) to the group sidebar,
   so the conferences controller won't refuse to work

Change-Id: I37bfb546c4bf8ad4078e4c9ca7a7292bb475af2c
Reviewed-on: https://gerrit.instructure.com/4954
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-05 14:31:01 -06:00
Zach Wily 9e2ba3d24a show terms in courses dropdown when it's necessary; fixes #4803
Rather than always showing the term of the course, we're going to show it if
the following conditions are met:
 * it's not the "Default Term"
 * the user has at least two courses with the same name in different terms

On the full list of enrollments screen, we'll always show the term if it's not
Default Term.

Change-Id: Id1424b13feb0c9cd65eed7cc48e980c3a4603f2d
Reviewed-on: https://gerrit.instructure.com/4907
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-03 14:40:14 -06:00
Brian Palmer eb214fabf4 don't require api_key when access_token is given to api request
refs #5029

For now we're going to continue to support api key+basic auth as an
alternative to oauth and access tokens, though eventually this will be
phased out.

This also switches all the api specs to using oauth tokens, except for
the new specs that explicitly test the old method is still supported.
There is one change: GET requests now require the api_key as well, if
using the api_key auth method.

Change-Id: I97d6c71be7afaa655da521d774930b2649961ffe
Reviewed-on: https://gerrit.instructure.com/4720
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-19 13:43:26 -06:00
Brian Palmer 65ed1dac46 implement oauth2 native app flow, closes #5029
Change-Id: Ieb6c7f10190775efb9a0c8adf6cd2928bca8af1c
Reviewed-on: https://gerrit.instructure.com/4683
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-18 22:27:36 -06:00
JT Olds 76fed4b1e2 prevent users without permission from using the user list parsing feature
we don't want unauthorized gathering of real names from usernames

Change-Id: I01448d351c9672c32110fccdd5c9bf8750f820cf
Reviewed-on: https://gerrit.instructure.com/4594
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-07-12 11:54:47 -06:00
Jon Jensen f73513f798 fix saml/cas login account scoping, closes #4973
Change-Id: Ida8a9c56979e3dceb7d1e4b4253dde838a63ce82
Reviewed-on: https://gerrit.instructure.com/4488
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-06-29 17:46:34 -06:00
Cody Cutrer 4e5b426f4c destroy "protected" pseudonyms when removing a user from an account
fixes #4915

Change-Id: Id7543f859b42c4df1f366bbb4eb086bddf84a609
Reviewed-on: https://gerrit.instructure.com/4296
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-06-20 14:15:55 -06:00
JT Olds bd7be9abc4 make sure a user is not kept enrolled in an empty crosslist shell course
refs #4828

Change-Id: I36bca8b46e96d222e580a247bbe353b3652826b9
Reviewed-on: https://gerrit.instructure.com/4184
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-06-14 10:47:07 -06:00
Brian Whitmer ebe1c46d0c concluded teachers should still have access to student grades, content
Concluded teachers should be able to see quiz statistics,
a read-only view of quizzes, student grades, discussions,
files (including download).  They should not be able to
change any grades, however.

fixes #4059

Change-Id: Ie44a29074ec27b9d0afb908b31f51b46b0e98728
Reviewed-on: https://gerrit.instructure.com/2783
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-06-09 16:08:45 -06:00
Zach Wily 819bfe1dc6 support a secondary ldap configuration for account authorization; fixes #4776
Adds the ability for admins to configure a second LDAP server that will be
queried after the primary, assuming the user could not be found on the
primary. This is a slight refactor towards a more flexible authorization
configs model. Changes include:

  * changed the authorization relationship on Account to has_many
  * for backwards compat with all the code that assumes one config, added
    a convenience method to Account
  * refactored the auth config editing screen to send multiple configs at a
    time
  * modified the pseudonym to iterate over all the auth configs (when using
    ldap), stopping at the first one that succeeds

Change-Id: I6bae474f542e8c7046f07d4ab2c27e7d6f64a1ce
Reviewed-on: https://gerrit.instructure.com/4108
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-06-08 23:06:29 -06:00
Brian Palmer 210795b339 truncate table rather than delete_all in specs
This shaves a few seconds off each selenium spec in my local env

Change-Id: I73af04e18a75c5964474bf396ea7bafc8527d384
Reviewed-on: https://gerrit.instructure.com/4083
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-06-06 15:38:34 -06:00
Bracken Mosbacker e15cb0e085 added fields for editing sis_source_ids and new sis permission
closes #4475

Change-Id: Ie6da7ec45dcba65409c0909d180358a3796319dc
Reviewed-on: https://gerrit.instructure.com/3944
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-05-31 17:53:46 -06:00
Jon Jensen af13294b29 give students full wiki privileges within groups, closes #4611
Change-Id: Ib902203c1b39bb1bc1b2d333ebd7713746326216
Reviewed-on: https://gerrit.instructure.com/3850
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-26 09:57:30 -06:00
Brian Palmer 04d36dcdf5 support batch mode for sis imports, refs #4397
In this mode, any courses, sections or enrollments that aren't
referenced in the sis import will be deleted.

This is the back-end piece, support in the UI and API are coming next.

Change-Id: Ica634f9fa7008ef7b612c4ea43163792f5d54fa5
Reviewed-on: https://gerrit.instructure.com/3768
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-05-23 09:52:56 -06:00
Brian Palmer 432a7fd6b3 send web conference invitiation notifications, refs #4513
Change-Id: I58740b718afd194db3da18faded9fcc9642c082d
Reviewed-on: https://gerrit.instructure.com/3731
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-20 12:48:09 -06:00
Zach Wily ac4d74082a add an alternate login url for CAS
This alternate url can be used for strange setups where someone wants to wrap
their CAS login in an iframe. When logging in via this method, the iframe will
be exited after returning from the CAS server.

Change-Id: I53561f824451a8b7319c4a821aaada9a459e6226
Reviewed-on: https://gerrit.instructure.com/3669
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-16 08:24:16 -06:00
Zach Wily d0f166b3f6 set root account correctly when creating sub-accounts; fixes #4439
Change-Id: Ia5ad2afcd86763780c73a1bbbe408228c4166b88
Reviewed-on: https://gerrit.instructure.com/3488
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-05-06 07:42:21 -06:00
Zach Wily df3d4c6351 use something more secure than UUID for our unique tokens; fixes #4264
Change-Id: I407b50b98e44eab4e341b596ebefe9f35af3dc37
Reviewed-on: https://gerrit.instructure.com/3097
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-15 10:54:47 -06:00
Cody Cutrer 6283c3a7fc Delegate to CAS for auth. Closes #4130
Change-Id: I6bd3ef11314f75dd14b2fa9d835ecc40e43b5f3b
Reviewed-on: https://gerrit.instructure.com/2994
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-08 15:17:39 -06:00
Brian Palmer f846e8b71e concrete support for http basic auth, specifically for the API
closes #3956

Change-Id: I8743aecef7126122ba57c06c8469300c5bc08ac7
Reviewed-on: https://gerrit.instructure.com/2536
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-09 10:13:00 -07:00
Brian Whitmer 41c9f12988 enforce term/course/section start and end dates
before we were recording these values but not doing
anything about it.  This commit starts scheduling
delayed_jobs to activate/conclude enrollments
in the background when dates pass.

it does not conclude/publish courses/sections
automatically, though.  if we want that to be
automated based on dates then I think we should
do that in a separate commit.

fixes #3356

Change-Id: Id94356fbc5b82196dd041fdb250607a7633cee9f
Reviewed-on: https://gerrit.instructure.com/2431
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-01 13:47:12 -07:00
Jon Jensen 86b062bf61 wimba integration, fixes #2989
added wimba web conferencing support, moved dimdim config into plugin
settings, fixed a few web conferencing ui issues

Change-Id: I6b36b0e594a9f296d14cd35bec02186478bcbd13
Reviewed-on: https://gerrit.instructure.com/2343
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-02-25 14:35:14 -07:00
Brian Palmer 6fad15dd0e undefine Spec::DSL::Main#context
We check responds_to?(:context) on many objects in our app, to duck type
context-owned objects. So in test mode when rspec is loaded, this causes
a lot of issues since every object ends up responding to :context.

Change-Id: I97f804e696e0e553b6fc7ef9b0700d0bdea7e9b2
Reviewed-on: https://gerrit.instructure.com/2221
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-02-09 13:57:32 -07:00
Brian Palmer a043962097 fix time zone issues in specs
Change-Id: I32082cfd4f7686d9a9c20d6cc7ecff1e68de2c96
Reviewed-on: https://gerrit.instructure.com/2207
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-02-08 14:12:17 -07:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes #6988138
2011-01-31 18:57:29 -07:00