Skip to content
Open
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
740f971
Add cadccutout to cadctools.
at88mph Nov 1, 2018
f15961c
s2362 - renamed opencadc_cutout to cadccutout
jburke-cadc Nov 7, 2018
bac2c27
Merge pull request #1 from jburke-cadc/s2362
at88mph Nov 7, 2018
553617a
Merge from opencadc_cutout.
at88mph Nov 7, 2018
07e58d6
Changes to rename package names.
at88mph Nov 7, 2018
9d9faef
Last rework.
at88mph Nov 8, 2018
3aa6280
Rename README.
at88mph Nov 8, 2018
f6c2c12
Flake8 compatible.
at88mph Nov 8, 2018
a7bbaa2
Flake8 changes. Code cleanup.
at88mph Nov 8, 2018
41bc347
Added __main__ for CLI access.
at88mph Nov 8, 2018
c57d8fd
Cleanup unused imports.
at88mph Nov 9, 2018
c397f63
Allow multiple cutout strings in CLI.
at88mph Nov 9, 2018
1a19ad8
Condense integration tests.
at88mph Nov 13, 2018
7ceb342
Add local install to dev_requirements.txt.
at88mph Nov 13, 2018
dcafde2
Add simple FITS example file.
at88mph Nov 14, 2018
45691f0
Add simple FITS example file.
at88mph Nov 14, 2018
e3eb93f
Skip certain tests awaiting for Astropy bug fix.
at88mph Nov 14, 2018
2b18073
Hushing the flake8 check.
at88mph Nov 14, 2018
5557434
Last flake8 changes.
at88mph Nov 14, 2018
e4e8c5a
Flake8 changes.
at88mph Nov 14, 2018
c72cf55
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Nov 14, 2018
36cc4d9
Remove test file not yet implemented.
at88mph Nov 14, 2018
379426f
Add 3.7 test.
at88mph Nov 14, 2018
050ef87
Add 3.7 test.
at88mph Nov 14, 2018
13c1b85
Remove 3.7 test.
at88mph Nov 14, 2018
33c27dc
s2362 - rework
jburke-cadc Nov 14, 2018
4342ea2
Merge branch 'master' of https://github.com/at88mph/cadctools into s2362
jburke-cadc Nov 14, 2018
ddf16ef
s2362 - added shape and transform to cadccutout init.py
jburke-cadc Nov 14, 2018
eda293b
Use strings for WCS input.
at88mph Nov 15, 2018
55ff057
Merge branch 'master' of https://github.com/at88mph/cadctools into s2362
jburke-cadc Nov 15, 2018
1349bf2
Accept lists as input.
at88mph Nov 15, 2018
16df324
Merge branch 'master' of https://github.com/at88mph/cadctools into s2362
jburke-cadc Nov 15, 2018
8bcd7ec
Change for no content overlap.
at88mph Nov 15, 2018
04a9375
Merge branch 'master' of https://github.com/at88mph/cadctools into s2362
jburke-cadc Nov 15, 2018
f88835a
Improving test coverage.
at88mph Nov 15, 2018
6a9efd2
Merge branch 'master' of https://github.com/at88mph/cadctools into s2362
jburke-cadc Nov 15, 2018
2a8f66f
Hushing flake8.
at88mph Nov 15, 2018
14cf451
s2362 - add transform call for world coordinates
jburke-cadc Nov 15, 2018
93fb6fc
Merge branch 'master' of https://github.com/at88mph/cadctools into s2362
jburke-cadc Nov 15, 2018
544adbf
s2362 - fixes for flake8 line length
jburke-cadc Nov 15, 2018
2d441c5
Increase test coverage.
at88mph Nov 15, 2018
e073068
Merge pull request #2 from jburke-cadc/s2362
at88mph Nov 15, 2018
017179e
Dependency fixes and test augments.
at88mph Nov 16, 2018
9ce062c
s2362 - flake8 fixes
jburke-cadc Nov 16, 2018
60b51c5
s2362 - do not set the logging level in unit tests
jburke-cadc Nov 16, 2018
1605935
Merge pull request #3 from jburke-cadc/s2362
at88mph Nov 16, 2018
dc8644a
Hush flake8.
at88mph Nov 16, 2018
322e918
Hush flake8.
at88mph Nov 16, 2018
5b57431
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Nov 16, 2018
e8317aa
Fixes and updates to allow command line access.
at88mph Nov 21, 2018
974a700
Last fixes.
at88mph Nov 21, 2018
174ed5e
Cleanup and updated Dockerfile.
at88mph Nov 21, 2018
350c5e8
Code review.
at88mph Nov 23, 2018
0a4a53d
Code review rework.
at88mph Nov 23, 2018
9534044
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Nov 27, 2018
8adb69a
Added docs.
at88mph Nov 27, 2018
177c8f4
Proper way to get version.
at88mph Nov 28, 2018
ce48ba1
Unnecessary logging.
at88mph Nov 28, 2018
7e6c00c
Replace test skipping.
at88mph Nov 28, 2018
b397f7c
Missing import.
at88mph Nov 28, 2018
ccce871
Hush the linter.
at88mph Nov 28, 2018
bc0fba5
Hush coveralls.
at88mph Nov 28, 2018
0bf8bbe
Integration test and WCS fixes.
at88mph Dec 5, 2018
abd3ed5
Fix spaces in ranges.
at88mph Dec 5, 2018
0b9bce2
Version increment.
at88mph Dec 5, 2018
7615b4c
Test augmentation and fixes for accuracy. Add buffers in integration…
at88mph Dec 6, 2018
1467af1
Added comment to integration test.
at88mph Dec 6, 2018
8874fda
Test improvements and cutout accuracy.
at88mph Dec 7, 2018
1fa0b04
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Dec 10, 2018
f6bcb03
Test fixes for transformations.
at88mph Dec 10, 2018
bd7fc72
Hush the linter.
at88mph Dec 10, 2018
61dc453
Hush the linter.
at88mph Dec 10, 2018
0648f11
Linter again...
at88mph Dec 10, 2018
22782e7
Hush the coverage.
at88mph Dec 10, 2018
df779a8
Shut up, linter.
at88mph Dec 10, 2018
4263a1a
Increase coverage.
at88mph Dec 10, 2018
beafd4e
Python 3 test fixes.
at88mph Dec 10, 2018
786a64f
Increase coverage.
at88mph Dec 10, 2018
9b5413d
Hush the linter.
at88mph Dec 10, 2018
22b42b8
Code review rework.
at88mph Dec 12, 2018
77ab6cc
Merge branch 'master' into master
at88mph Dec 13, 2018
5970cfd
Update core.py
at88mph Dec 13, 2018
5ccb144
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Dec 13, 2018
8ebfde6
WCS header fixes.
at88mph Dec 13, 2018
2626e5e
Version bump.
at88mph Dec 13, 2018
175b21a
Satisfy flake8.
at88mph Dec 14, 2018
7d9a628
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Jan 24, 2019
851909a
Small fixes to pass Exceptions up.
at88mph Jan 24, 2019
58bff93
Checks for input/output.
at88mph Jan 24, 2019
a916266
Default to unset.
at88mph Jan 24, 2019
47ade75
Error reporting.
at88mph Jan 24, 2019
8e9b6f8
Push errors up the chain.
at88mph Jan 25, 2019
cfcedb7
Still trying to fix CGI error relays.
at88mph Jan 25, 2019
5969dc1
Print OSError message.
at88mph Jan 25, 2019
0d70396
Fixes to accommodate wildcards.
at88mph Feb 19, 2019
d3c8d04
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Feb 28, 2019
568b14c
Fix for spacing in names.
at88mph Feb 28, 2019
0bcab5f
Fix for cutout output and integration tests.
at88mph Mar 1, 2019
974da5c
Hush the linter.
at88mph Mar 6, 2019
61432d8
Further lint hushing.
at88mph Mar 6, 2019
7e62ea6
Fix Python 2.7
at88mph Mar 6, 2019
fd2b667
Default input and outputs to None. Hush the linter some more.
at88mph Mar 6, 2019
2b772b0
Shut the linter up.
at88mph Mar 6, 2019
2de5c15
Increase code coverage.
at88mph Mar 7, 2019
fdfe181
Improve code coverage.
at88mph Mar 7, 2019
b95307e
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Mar 7, 2019
89b9955
Fix for subtle parsing errors.
at88mph Mar 8, 2019
af8b7d4
Small fixes to tolerate spaces.
at88mph Mar 10, 2019
38b6b9b
Improvement to extension handling.
at88mph Mar 10, 2019
899d490
Add to README.
at88mph Mar 10, 2019
f3003d2
Hush linter.
at88mph Mar 10, 2019
84a7f49
Increase code coverage
at88mph Mar 10, 2019
963d1c2
Cutout rework to allow striding.
at88mph Mar 26, 2019
71052d2
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Mar 26, 2019
43f090b
Cleanup and complete support for wildcard (globbing).
at88mph Mar 27, 2019
cf9b6ae
Added striding support.
at88mph Mar 28, 2019
384d102
Major version increase.
at88mph Mar 28, 2019
c6deff5
Fix for WCS.
at88mph Mar 28, 2019
9fae75b
Fixes for tests.
at88mph Mar 28, 2019
59661dd
Hush the linter.
at88mph Mar 28, 2019
aa97c0f
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Apr 3, 2019
8779a10
Fix numeric conversion.
at88mph Apr 3, 2019
6c51a8b
Fix cutouts.
at88mph Apr 3, 2019
8457ee7
Fix for striding and inverse y values.
Apr 6, 2019
7ce9293
Update test_integration_test.py
at88mph Apr 6, 2019
21d5e27
Hush the linter
at88mph Apr 6, 2019
258f50b
Accommodate older Pythons.
at88mph Apr 6, 2019
06e8945
Fix for missing values in older Python versions.
at88mph Apr 6, 2019
b23edc5
Update cutoutnd.py
at88mph Apr 6, 2019
b2fae64
Update cutoutnd.py
at88mph Apr 7, 2019
aa318e5
Fix for striding with wildcards.
Apr 7, 2019
ee5d434
Fix for striding with wildcards.
Apr 7, 2019
ea81031
Fix incorrect padding.
at88mph Apr 7, 2019
381b841
Fix setting step appropriately.
at88mph Apr 8, 2019
972663f
Update coverage.
Apr 9, 2019
70453e5
Merge branch 'master' into master
at88mph Apr 9, 2019
4d72b27
Code review rework.
at88mph Apr 12, 2019
d3d0fbe
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Apr 12, 2019
1a37e09
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Apr 25, 2019
870e46d
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Jul 29, 2019
08f3cf9
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Jan 13, 2020
4747459
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Mar 3, 2020
df874bc
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Apr 2, 2020
e839ce7
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Aug 12, 2020
ace4f10
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Jan 18, 2021
1d3a854
Merge branch 'master' of https://github.com/opencadc/cadctools
at88mph Jun 6, 2022
33f6a86
Merge branch 'main' of https://github.com/opencadc/cadctools
at88mph Aug 7, 2026
746cb02
fix: fix for token uri
at88mph Aug 7, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cadcutils/cadcutils/net/netutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@
SSO_SECURITY_METHODS = {
'tls-with-certificate': 'ivo://ivoa.net/sso#tls-with-certificate',
'cookie': 'ivo://ivoa.net/sso#cookie',
'token': 'vos://cadc.nrc.ca~vospace/CADC/std/Auth#token-1.0'
'token': 'ivo://ivoa.net/sso#token'
}
# Older vos clients still send the legacy CADC token securityMethod URI.
_LEGACY_TOKEN_SECURITY_METHOD = 'vos://cadc.nrc.ca~vospace/CADC/std/Auth#token-1.0'


def get_header_filename(headers):
Expand Down Expand Up @@ -232,6 +234,8 @@ def transfer(self, endpoint_url, uri, direction, view=None, cutout=None,

if security_methods:
for sm in security_methods:
if sm == _LEGACY_TOKEN_SECURITY_METHOD:
sm = SSO_SECURITY_METHODS['token']
if sm not in SSO_SECURITY_METHODS.values():
raise AttributeError(
'Invalid security method {}. Supported values: {}'.
Expand Down
Loading