Update for rules of instance names#423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fantix merged 4 commits into from
Mar 22, 2023
Merged

Update for rules of instance names #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd01087
Update for rules of instance names
fantix Mar 14, 2023
b2d2910
CRF: address code review comments
fantix Mar 15, 2023
f62b39a
update: ban underscores for the cloud
fantix Mar 20, 2023
9f77292
Update shared testcases
fantix Mar 22, 2023
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
48 changes: 32 additions & 16 deletions edgedb/con_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,18 @@
r'((?:(?:\s|^)-\s*)?\d*\.?\d*)\s*(?i:us(\s|\d|\.|$)|microseconds?(\s|$))',
)
INSTANCE_NAME_RE = re.compile(
r'^([A-Za-z_]\w*)(?:/([A-Za-z_]\w*))?$',
r'^(\w(?:-?\w)*)$',
re.ASCII,
)
CLOUD_INSTANCE_NAME_RE = re.compile(
r'^([A-Za-z0-9](?:-?[A-Za-z0-9])*)/([A-Za-z0-9](?:-?[A-Za-z0-9])*)$',
re.ASCII,
)
DSN_RE = re.compile(
r'^[a-z]+://',
re.IGNORECASE,
)
DOMAIN_LABEL_MAX_LENGTH = 63


class ClientConfiguration(typing.NamedTuple):
Expand DownExpand Up@@ -519,11 +529,10 @@ def _parse_connect_dsn_and_args(
):
resolved_config = ResolvedConnectConfig()

dsn, instance_name = (
(dsn, None)
if dsn is not None and re.match('(?i)^[a-z]+://', dsn)
else (None, dsn)
)
if dsn and DSN_RE.match(dsn):
instance_name = None
else:
instance_name, dsn = dsn, None

has_compound_options = _resolve_config_options(
resolved_config,
Expand DownExpand Up@@ -861,6 +870,13 @@ def _parse_cloud_instance_name_into_config(
org_slug: str,
instance_name: str,
):
label = f"{instance_name}--{org_slug}"
if len(label) > DOMAIN_LABEL_MAX_LENGTH:
raise ValueError(

@elpranselpransMar 14, 2023

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.

Should probably be errors.InterfaceError or a subclass.

@fantixfantixMar 15, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I'll create a new PR for this - too many of them to fix in a CRF.

f"invalid instance name: cloud instance name length cannot exceed "
f"{DOMAIN_LABEL_MAX_LENGTH - 1} characters: "
f"{org_slug}/{instance_name}"
)
secret_key = resolved_config.secret_key
if secret_key is None:
try:
Expand DownExpand Up@@ -889,7 +905,7 @@ def _parse_cloud_instance_name_into_config(
raise errors.ClientConnectionError("Invalid secret key")
payload = f"{org_slug}/{instance_name}".encode("utf-8")
dns_bucket = binascii.crc_hqx(payload, 0) % 100
host = f"{instance_name}--{org_slug}.c-{dns_bucket:02d}.i.{dns_zone}"
host = f"{label}.c-{dns_bucket:02d}.i.{dns_zone}"
resolved_config.set_host(host, source)


Expand DownExpand Up@@ -973,23 +989,23 @@ def _resolve_config_options(
else:
creds = cred_utils.validate_credentials(cred_data)
source = "credentials"
elif INSTANCE_NAME_RE.match(instance_name[0]):
source = instance_name[1]
creds = cred_utils.read_credentials(
cred_utils.get_credentials_path(instance_name[0]),
)
else:
name_match = INSTANCE_NAME_RE.match(instance_name[0])
name_match = CLOUD_INSTANCE_NAME_RE.match(instance_name[0])
if name_match is None:
raise ValueError(
f'invalid DSN or instance name: "{instance_name[0]}"'
)
source = instance_name[1]
org, inst = name_match.groups()
if inst is not None:
_parse_cloud_instance_name_into_config(
resolved_config, source, org, inst
)
return True

creds = cred_utils.read_credentials(
cred_utils.get_credentials_path(instance_name[0]),
_parse_cloud_instance_name_into_config(
resolved_config, source, org, inst
)
return True

resolved_config.set_host(creds.get('host'), source)
resolved_config.set_port(creds.get('port'), source)
Expand Down
2 changes: 1 addition & 1 deletion tests/shared-client-testcases
Open in desktop
Submodule shared-client-testcases updated from 72675e to 32cb54
2 changes: 2 additions & 0 deletions tests/test_con_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,8 @@ class TestConUtils(unittest.TestCase):
RuntimeError, 'cannot read credentials'),
'invalid_dsn_or_instance_name': (
ValueError, 'invalid DSN or instance name'),
'invalid_instance_name': (
ValueError, 'invalid instance name'),
'invalid_dsn': (ValueError, 'invalid DSN'),
'unix_socket_unsupported': (
ValueError, 'unix socket paths not supported'),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Update for rules of instance names#423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

fantix
merged 4 commits into

from

Mar 22, 2023
 Merged


Update for rules of instance names
#423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
dd01087

Update for rules of instance names


fantix Mar 14, 2023
b2d2910

CRF: address code review comments


fantix Mar 15, 2023
f62b39a

update: ban underscores for the cloud


fantix Mar 20, 2023
9f77292

Update shared testcases


fantix Mar 22, 2023

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


48 changes: 32 additions & 16 deletions
edgedb/con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,18 @@
 r'((?:(?:\s|^)-\s*)?\d*\.?\d*)\s*(?i:us(\s|\d|\.|$)|microseconds?(\s|$))',
)
INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z_]\w*)(?:/([A-Za-z_]\w*))?$',
 r'^(\w(?:-?\w)*)$',
 re.ASCII,
)
CLOUD_INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z0-9](?:-?[A-Za-z0-9])*)/([A-Za-z0-9](?:-?[A-Za-z0-9])*)$',
 re.ASCII,
)
DSN_RE = re.compile(
 r'^[a-z]+://',
 re.IGNORECASE,
)
DOMAIN_LABEL_MAX_LENGTH = 63


class ClientConfiguration(typing.NamedTuple):
Expand DownExpand Up@@ -519,11 +529,10 @@ def _parse_connect_dsn_and_args(
):
 resolved_config = ResolvedConnectConfig()

 dsn, instance_name = (
 (dsn, None)
 if dsn is not None and re.match('(?i)^[a-z]+://', dsn)
 else (None, dsn)
 )
 if dsn and DSN_RE.match(dsn):
 instance_name = None
 else:
 instance_name, dsn = dsn, None

 has_compound_options = _resolve_config_options(
 resolved_config,
Expand DownExpand Up@@ -861,6 +870,13 @@ def _parse_cloud_instance_name_into_config(
 org_slug: str,
 instance_name: str,
):
 label = f"{instance_name}--{org_slug}"
 if len(label) > DOMAIN_LABEL_MAX_LENGTH:
 raise ValueError(
@elpranselpransMar 14, 2023

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.

Should probably be errors.InterfaceError or a subclass.
@fantixfantixMar 15, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I'll create a new PR for this - too many of them to fix in a CRF.
 f"invalid instance name: cloud instance name length cannot exceed "
 f"{DOMAIN_LABEL_MAX_LENGTH - 1} characters: "
 f"{org_slug}/{instance_name}"
 )
 secret_key = resolved_config.secret_key
 if secret_key is None:
 try:
Expand DownExpand Up@@ -889,7 +905,7 @@ def _parse_cloud_instance_name_into_config(
 raise errors.ClientConnectionError("Invalid secret key")
 payload = f"{org_slug}/{instance_name}".encode("utf-8")
 dns_bucket = binascii.crc_hqx(payload, 0) % 100
 host = f"{instance_name}--{org_slug}.c-{dns_bucket:02d}.i.{dns_zone}"
 host = f"{label}.c-{dns_bucket:02d}.i.{dns_zone}"
 resolved_config.set_host(host, source)


Expand DownExpand Up@@ -973,23 +989,23 @@ def _resolve_config_options(
 else:
 creds = cred_utils.validate_credentials(cred_data)
 source = "credentials"
 elif INSTANCE_NAME_RE.match(instance_name[0]):
 source = instance_name[1]
 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 )
 else:
 name_match = INSTANCE_NAME_RE.match(instance_name[0])
 name_match = CLOUD_INSTANCE_NAME_RE.match(instance_name[0])
 if name_match is None:
 raise ValueError(
 f'invalid DSN or instance name: "{instance_name[0]}"'
 )
 source = instance_name[1]
 org, inst = name_match.groups()
 if inst is not None:
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 resolved_config.set_host(creds.get('host'), source)
 resolved_config.set_port(creds.get('port'), source)
Expand Down

2 changes: 1 addition & 1 deletion
tests/shared-client-testcases

Open in desktop


Submodule shared-client-testcases
updated

from 72675e to 32cb54


2 changes: 2 additions & 0 deletions
tests/test_con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,8 @@ class TestConUtils(unittest.TestCase):
 RuntimeError, 'cannot read credentials'),
 'invalid_dsn_or_instance_name': (
 ValueError, 'invalid DSN or instance name'),
 'invalid_instance_name': (
 ValueError, 'invalid instance name'),
 'invalid_dsn': (ValueError, 'invalid DSN'),
 'unix_socket_unsupported': (
 ValueError, 'unix socket paths not supported'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update for rules of instance names#423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

fantix
merged 4 commits into

from

Mar 22, 2023
 Merged


Update for rules of instance names
#423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
dd01087

Update for rules of instance names


fantix Mar 14, 2023
b2d2910

CRF: address code review comments


fantix Mar 15, 2023
f62b39a

update: ban underscores for the cloud


fantix Mar 20, 2023
9f77292

Update shared testcases


fantix Mar 22, 2023

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


48 changes: 32 additions & 16 deletions
edgedb/con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,18 @@
 r'((?:(?:\s|^)-\s*)?\d*\.?\d*)\s*(?i:us(\s|\d|\.|$)|microseconds?(\s|$))',
)
INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z_]\w*)(?:/([A-Za-z_]\w*))?$',
 r'^(\w(?:-?\w)*)$',
 re.ASCII,
)
CLOUD_INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z0-9](?:-?[A-Za-z0-9])*)/([A-Za-z0-9](?:-?[A-Za-z0-9])*)$',
 re.ASCII,
)
DSN_RE = re.compile(
 r'^[a-z]+://',
 re.IGNORECASE,
)
DOMAIN_LABEL_MAX_LENGTH = 63


class ClientConfiguration(typing.NamedTuple):
Expand DownExpand Up@@ -519,11 +529,10 @@ def _parse_connect_dsn_and_args(
):
 resolved_config = ResolvedConnectConfig()

 dsn, instance_name = (
 (dsn, None)
 if dsn is not None and re.match('(?i)^[a-z]+://', dsn)
 else (None, dsn)
 )
 if dsn and DSN_RE.match(dsn):
 instance_name = None
 else:
 instance_name, dsn = dsn, None

 has_compound_options = _resolve_config_options(
 resolved_config,
Expand DownExpand Up@@ -861,6 +870,13 @@ def _parse_cloud_instance_name_into_config(
 org_slug: str,
 instance_name: str,
):
 label = f"{instance_name}--{org_slug}"
 if len(label) > DOMAIN_LABEL_MAX_LENGTH:
 raise ValueError(
@elpranselpransMar 14, 2023

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.

Should probably be errors.InterfaceError or a subclass.
@fantixfantixMar 15, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I'll create a new PR for this - too many of them to fix in a CRF.
 f"invalid instance name: cloud instance name length cannot exceed "
 f"{DOMAIN_LABEL_MAX_LENGTH - 1} characters: "
 f"{org_slug}/{instance_name}"
 )
 secret_key = resolved_config.secret_key
 if secret_key is None:
 try:
Expand DownExpand Up@@ -889,7 +905,7 @@ def _parse_cloud_instance_name_into_config(
 raise errors.ClientConnectionError("Invalid secret key")
 payload = f"{org_slug}/{instance_name}".encode("utf-8")
 dns_bucket = binascii.crc_hqx(payload, 0) % 100
 host = f"{instance_name}--{org_slug}.c-{dns_bucket:02d}.i.{dns_zone}"
 host = f"{label}.c-{dns_bucket:02d}.i.{dns_zone}"
 resolved_config.set_host(host, source)


Expand DownExpand Up@@ -973,23 +989,23 @@ def _resolve_config_options(
 else:
 creds = cred_utils.validate_credentials(cred_data)
 source = "credentials"
 elif INSTANCE_NAME_RE.match(instance_name[0]):
 source = instance_name[1]
 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 )
 else:
 name_match = INSTANCE_NAME_RE.match(instance_name[0])
 name_match = CLOUD_INSTANCE_NAME_RE.match(instance_name[0])
 if name_match is None:
 raise ValueError(
 f'invalid DSN or instance name: "{instance_name[0]}"'
 )
 source = instance_name[1]
 org, inst = name_match.groups()
 if inst is not None:
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 resolved_config.set_host(creds.get('host'), source)
 resolved_config.set_port(creds.get('port'), source)
Expand Down

2 changes: 1 addition & 1 deletion
tests/shared-client-testcases

Open in desktop


Submodule shared-client-testcases
updated

from 72675e to 32cb54


2 changes: 2 additions & 0 deletions
tests/test_con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,8 @@ class TestConUtils(unittest.TestCase):
 RuntimeError, 'cannot read credentials'),
 'invalid_dsn_or_instance_name': (
 ValueError, 'invalid DSN or instance name'),
 'invalid_instance_name': (
 ValueError, 'invalid instance name'),
 'invalid_dsn': (ValueError, 'invalid DSN'),
 'unix_socket_unsupported': (
 ValueError, 'unix socket paths not supported'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update for rules of instance names#423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

fantix
merged 4 commits into

from

Mar 22, 2023
 Merged


Update for rules of instance names
#423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
dd01087

Update for rules of instance names


fantix Mar 14, 2023
b2d2910

CRF: address code review comments


fantix Mar 15, 2023
f62b39a

update: ban underscores for the cloud


fantix Mar 20, 2023
9f77292

Update shared testcases


fantix Mar 22, 2023

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


48 changes: 32 additions & 16 deletions
edgedb/con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,18 @@
 r'((?:(?:\s|^)-\s*)?\d*\.?\d*)\s*(?i:us(\s|\d|\.|$)|microseconds?(\s|$))',
)
INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z_]\w*)(?:/([A-Za-z_]\w*))?$',
 r'^(\w(?:-?\w)*)$',
 re.ASCII,
)
CLOUD_INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z0-9](?:-?[A-Za-z0-9])*)/([A-Za-z0-9](?:-?[A-Za-z0-9])*)$',
 re.ASCII,
)
DSN_RE = re.compile(
 r'^[a-z]+://',
 re.IGNORECASE,
)
DOMAIN_LABEL_MAX_LENGTH = 63


class ClientConfiguration(typing.NamedTuple):
Expand DownExpand Up@@ -519,11 +529,10 @@ def _parse_connect_dsn_and_args(
):
 resolved_config = ResolvedConnectConfig()

 dsn, instance_name = (
 (dsn, None)
 if dsn is not None and re.match('(?i)^[a-z]+://', dsn)
 else (None, dsn)
 )
 if dsn and DSN_RE.match(dsn):
 instance_name = None
 else:
 instance_name, dsn = dsn, None

 has_compound_options = _resolve_config_options(
 resolved_config,
Expand DownExpand Up@@ -861,6 +870,13 @@ def _parse_cloud_instance_name_into_config(
 org_slug: str,
 instance_name: str,
):
 label = f"{instance_name}--{org_slug}"
 if len(label) > DOMAIN_LABEL_MAX_LENGTH:
 raise ValueError(
@elpranselpransMar 14, 2023

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.

Should probably be errors.InterfaceError or a subclass.
@fantixfantixMar 15, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I'll create a new PR for this - too many of them to fix in a CRF.
 f"invalid instance name: cloud instance name length cannot exceed "
 f"{DOMAIN_LABEL_MAX_LENGTH - 1} characters: "
 f"{org_slug}/{instance_name}"
 )
 secret_key = resolved_config.secret_key
 if secret_key is None:
 try:
Expand DownExpand Up@@ -889,7 +905,7 @@ def _parse_cloud_instance_name_into_config(
 raise errors.ClientConnectionError("Invalid secret key")
 payload = f"{org_slug}/{instance_name}".encode("utf-8")
 dns_bucket = binascii.crc_hqx(payload, 0) % 100
 host = f"{instance_name}--{org_slug}.c-{dns_bucket:02d}.i.{dns_zone}"
 host = f"{label}.c-{dns_bucket:02d}.i.{dns_zone}"
 resolved_config.set_host(host, source)


Expand DownExpand Up@@ -973,23 +989,23 @@ def _resolve_config_options(
 else:
 creds = cred_utils.validate_credentials(cred_data)
 source = "credentials"
 elif INSTANCE_NAME_RE.match(instance_name[0]):
 source = instance_name[1]
 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 )
 else:
 name_match = INSTANCE_NAME_RE.match(instance_name[0])
 name_match = CLOUD_INSTANCE_NAME_RE.match(instance_name[0])
 if name_match is None:
 raise ValueError(
 f'invalid DSN or instance name: "{instance_name[0]}"'
 )
 source = instance_name[1]
 org, inst = name_match.groups()
 if inst is not None:
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 resolved_config.set_host(creds.get('host'), source)
 resolved_config.set_port(creds.get('port'), source)
Expand Down

2 changes: 1 addition & 1 deletion
tests/shared-client-testcases

Open in desktop


Submodule shared-client-testcases
updated

from 72675e to 32cb54


2 changes: 2 additions & 0 deletions
tests/test_con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,8 @@ class TestConUtils(unittest.TestCase):
 RuntimeError, 'cannot read credentials'),
 'invalid_dsn_or_instance_name': (
 ValueError, 'invalid DSN or instance name'),
 'invalid_instance_name': (
 ValueError, 'invalid instance name'),
 'invalid_dsn': (ValueError, 'invalid DSN'),
 'unix_socket_unsupported': (
 ValueError, 'unix socket paths not supported'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Update for rules of instance names#423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

fantix
merged 4 commits into

from

Mar 22, 2023
 Merged


Update for rules of instance names
#423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
dd01087

Update for rules of instance names


fantix Mar 14, 2023
b2d2910

CRF: address code review comments


fantix Mar 15, 2023
f62b39a

update: ban underscores for the cloud


fantix Mar 20, 2023
9f77292

Update shared testcases


fantix Mar 22, 2023

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


48 changes: 32 additions & 16 deletions
edgedb/con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,18 @@
 r'((?:(?:\s|^)-\s*)?\d*\.?\d*)\s*(?i:us(\s|\d|\.|$)|microseconds?(\s|$))',
)
INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z_]\w*)(?:/([A-Za-z_]\w*))?$',
 r'^(\w(?:-?\w)*)$',
 re.ASCII,
)
CLOUD_INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z0-9](?:-?[A-Za-z0-9])*)/([A-Za-z0-9](?:-?[A-Za-z0-9])*)$',
 re.ASCII,
)
DSN_RE = re.compile(
 r'^[a-z]+://',
 re.IGNORECASE,
)
DOMAIN_LABEL_MAX_LENGTH = 63


class ClientConfiguration(typing.NamedTuple):
Expand DownExpand Up@@ -519,11 +529,10 @@ def _parse_connect_dsn_and_args(
):
 resolved_config = ResolvedConnectConfig()

 dsn, instance_name = (
 (dsn, None)
 if dsn is not None and re.match('(?i)^[a-z]+://', dsn)
 else (None, dsn)
 )
 if dsn and DSN_RE.match(dsn):
 instance_name = None
 else:
 instance_name, dsn = dsn, None

 has_compound_options = _resolve_config_options(
 resolved_config,
Expand DownExpand Up@@ -861,6 +870,13 @@ def _parse_cloud_instance_name_into_config(
 org_slug: str,
 instance_name: str,
):
 label = f"{instance_name}--{org_slug}"
 if len(label) > DOMAIN_LABEL_MAX_LENGTH:
 raise ValueError(
@elpranselpransMar 14, 2023

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.

Should probably be errors.InterfaceError or a subclass.
@fantixfantixMar 15, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I'll create a new PR for this - too many of them to fix in a CRF.
 f"invalid instance name: cloud instance name length cannot exceed "
 f"{DOMAIN_LABEL_MAX_LENGTH - 1} characters: "
 f"{org_slug}/{instance_name}"
 )
 secret_key = resolved_config.secret_key
 if secret_key is None:
 try:
Expand DownExpand Up@@ -889,7 +905,7 @@ def _parse_cloud_instance_name_into_config(
 raise errors.ClientConnectionError("Invalid secret key")
 payload = f"{org_slug}/{instance_name}".encode("utf-8")
 dns_bucket = binascii.crc_hqx(payload, 0) % 100
 host = f"{instance_name}--{org_slug}.c-{dns_bucket:02d}.i.{dns_zone}"
 host = f"{label}.c-{dns_bucket:02d}.i.{dns_zone}"
 resolved_config.set_host(host, source)


Expand DownExpand Up@@ -973,23 +989,23 @@ def _resolve_config_options(
 else:
 creds = cred_utils.validate_credentials(cred_data)
 source = "credentials"
 elif INSTANCE_NAME_RE.match(instance_name[0]):
 source = instance_name[1]
 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 )
 else:
 name_match = INSTANCE_NAME_RE.match(instance_name[0])
 name_match = CLOUD_INSTANCE_NAME_RE.match(instance_name[0])
 if name_match is None:
 raise ValueError(
 f'invalid DSN or instance name: "{instance_name[0]}"'
 )
 source = instance_name[1]
 org, inst = name_match.groups()
 if inst is not None:
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 resolved_config.set_host(creds.get('host'), source)
 resolved_config.set_port(creds.get('port'), source)
Expand Down

2 changes: 1 addition & 1 deletion
tests/shared-client-testcases

Open in desktop


Submodule shared-client-testcases
updated

from 72675e to 32cb54


2 changes: 2 additions & 0 deletions
tests/test_con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,8 @@ class TestConUtils(unittest.TestCase):
 RuntimeError, 'cannot read credentials'),
 'invalid_dsn_or_instance_name': (
 ValueError, 'invalid DSN or instance name'),
 'invalid_instance_name': (
 ValueError, 'invalid instance name'),
 'invalid_dsn': (ValueError, 'invalid DSN'),
 'unix_socket_unsupported': (
 ValueError, 'unix socket paths not supported'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update for rules of instance names#423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

fantix
merged 4 commits into

from

Mar 22, 2023
 Merged


Update for rules of instance names
#423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
dd01087

Update for rules of instance names


fantix Mar 14, 2023
b2d2910

CRF: address code review comments


fantix Mar 15, 2023
f62b39a

update: ban underscores for the cloud


fantix Mar 20, 2023
9f77292

Update shared testcases


fantix Mar 22, 2023

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


48 changes: 32 additions & 16 deletions
edgedb/con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,18 @@
 r'((?:(?:\s|^)-\s*)?\d*\.?\d*)\s*(?i:us(\s|\d|\.|$)|microseconds?(\s|$))',
)
INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z_]\w*)(?:/([A-Za-z_]\w*))?$',
 r'^(\w(?:-?\w)*)$',
 re.ASCII,
)
CLOUD_INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z0-9](?:-?[A-Za-z0-9])*)/([A-Za-z0-9](?:-?[A-Za-z0-9])*)$',
 re.ASCII,
)
DSN_RE = re.compile(
 r'^[a-z]+://',
 re.IGNORECASE,
)
DOMAIN_LABEL_MAX_LENGTH = 63


class ClientConfiguration(typing.NamedTuple):
Expand DownExpand Up@@ -519,11 +529,10 @@ def _parse_connect_dsn_and_args(
):
 resolved_config = ResolvedConnectConfig()

 dsn, instance_name = (
 (dsn, None)
 if dsn is not None and re.match('(?i)^[a-z]+://', dsn)
 else (None, dsn)
 )
 if dsn and DSN_RE.match(dsn):
 instance_name = None
 else:
 instance_name, dsn = dsn, None

 has_compound_options = _resolve_config_options(
 resolved_config,
Expand DownExpand Up@@ -861,6 +870,13 @@ def _parse_cloud_instance_name_into_config(
 org_slug: str,
 instance_name: str,
):
 label = f"{instance_name}--{org_slug}"
 if len(label) > DOMAIN_LABEL_MAX_LENGTH:
 raise ValueError(
@elpranselpransMar 14, 2023

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.

Should probably be errors.InterfaceError or a subclass.
@fantixfantixMar 15, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I'll create a new PR for this - too many of them to fix in a CRF.
 f"invalid instance name: cloud instance name length cannot exceed "
 f"{DOMAIN_LABEL_MAX_LENGTH - 1} characters: "
 f"{org_slug}/{instance_name}"
 )
 secret_key = resolved_config.secret_key
 if secret_key is None:
 try:
Expand DownExpand Up@@ -889,7 +905,7 @@ def _parse_cloud_instance_name_into_config(
 raise errors.ClientConnectionError("Invalid secret key")
 payload = f"{org_slug}/{instance_name}".encode("utf-8")
 dns_bucket = binascii.crc_hqx(payload, 0) % 100
 host = f"{instance_name}--{org_slug}.c-{dns_bucket:02d}.i.{dns_zone}"
 host = f"{label}.c-{dns_bucket:02d}.i.{dns_zone}"
 resolved_config.set_host(host, source)


Expand DownExpand Up@@ -973,23 +989,23 @@ def _resolve_config_options(
 else:
 creds = cred_utils.validate_credentials(cred_data)
 source = "credentials"
 elif INSTANCE_NAME_RE.match(instance_name[0]):
 source = instance_name[1]
 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 )
 else:
 name_match = INSTANCE_NAME_RE.match(instance_name[0])
 name_match = CLOUD_INSTANCE_NAME_RE.match(instance_name[0])
 if name_match is None:
 raise ValueError(
 f'invalid DSN or instance name: "{instance_name[0]}"'
 )
 source = instance_name[1]
 org, inst = name_match.groups()
 if inst is not None:
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 resolved_config.set_host(creds.get('host'), source)
 resolved_config.set_port(creds.get('port'), source)
Expand Down

2 changes: 1 addition & 1 deletion
tests/shared-client-testcases

Open in desktop


Submodule shared-client-testcases
updated

from 72675e to 32cb54


2 changes: 2 additions & 0 deletions
tests/test_con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,8 @@ class TestConUtils(unittest.TestCase):
 RuntimeError, 'cannot read credentials'),
 'invalid_dsn_or_instance_name': (
 ValueError, 'invalid DSN or instance name'),
 'invalid_instance_name': (
 ValueError, 'invalid instance name'),
 'invalid_dsn': (ValueError, 'invalid DSN'),
 'unix_socket_unsupported': (
 ValueError, 'unix socket paths not supported'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update for rules of instance names#423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

fantix
merged 4 commits into

from

Mar 22, 2023
 Merged


Update for rules of instance names
#423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
dd01087

Update for rules of instance names


fantix Mar 14, 2023
b2d2910

CRF: address code review comments


fantix Mar 15, 2023
f62b39a

update: ban underscores for the cloud


fantix Mar 20, 2023
9f77292

Update shared testcases


fantix Mar 22, 2023

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


48 changes: 32 additions & 16 deletions
edgedb/con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,18 @@
 r'((?:(?:\s|^)-\s*)?\d*\.?\d*)\s*(?i:us(\s|\d|\.|$)|microseconds?(\s|$))',
)
INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z_]\w*)(?:/([A-Za-z_]\w*))?$',
 r'^(\w(?:-?\w)*)$',
 re.ASCII,
)
CLOUD_INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z0-9](?:-?[A-Za-z0-9])*)/([A-Za-z0-9](?:-?[A-Za-z0-9])*)$',
 re.ASCII,
)
DSN_RE = re.compile(
 r'^[a-z]+://',
 re.IGNORECASE,
)
DOMAIN_LABEL_MAX_LENGTH = 63


class ClientConfiguration(typing.NamedTuple):
Expand DownExpand Up@@ -519,11 +529,10 @@ def _parse_connect_dsn_and_args(
):
 resolved_config = ResolvedConnectConfig()

 dsn, instance_name = (
 (dsn, None)
 if dsn is not None and re.match('(?i)^[a-z]+://', dsn)
 else (None, dsn)
 )
 if dsn and DSN_RE.match(dsn):
 instance_name = None
 else:
 instance_name, dsn = dsn, None

 has_compound_options = _resolve_config_options(
 resolved_config,
Expand DownExpand Up@@ -861,6 +870,13 @@ def _parse_cloud_instance_name_into_config(
 org_slug: str,
 instance_name: str,
):
 label = f"{instance_name}--{org_slug}"
 if len(label) > DOMAIN_LABEL_MAX_LENGTH:
 raise ValueError(
@elpranselpransMar 14, 2023

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.

Should probably be errors.InterfaceError or a subclass.
@fantixfantixMar 15, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I'll create a new PR for this - too many of them to fix in a CRF.
 f"invalid instance name: cloud instance name length cannot exceed "
 f"{DOMAIN_LABEL_MAX_LENGTH - 1} characters: "
 f"{org_slug}/{instance_name}"
 )
 secret_key = resolved_config.secret_key
 if secret_key is None:
 try:
Expand DownExpand Up@@ -889,7 +905,7 @@ def _parse_cloud_instance_name_into_config(
 raise errors.ClientConnectionError("Invalid secret key")
 payload = f"{org_slug}/{instance_name}".encode("utf-8")
 dns_bucket = binascii.crc_hqx(payload, 0) % 100
 host = f"{instance_name}--{org_slug}.c-{dns_bucket:02d}.i.{dns_zone}"
 host = f"{label}.c-{dns_bucket:02d}.i.{dns_zone}"
 resolved_config.set_host(host, source)


Expand DownExpand Up@@ -973,23 +989,23 @@ def _resolve_config_options(
 else:
 creds = cred_utils.validate_credentials(cred_data)
 source = "credentials"
 elif INSTANCE_NAME_RE.match(instance_name[0]):
 source = instance_name[1]
 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 )
 else:
 name_match = INSTANCE_NAME_RE.match(instance_name[0])
 name_match = CLOUD_INSTANCE_NAME_RE.match(instance_name[0])
 if name_match is None:
 raise ValueError(
 f'invalid DSN or instance name: "{instance_name[0]}"'
 )
 source = instance_name[1]
 org, inst = name_match.groups()
 if inst is not None:
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 resolved_config.set_host(creds.get('host'), source)
 resolved_config.set_port(creds.get('port'), source)
Expand Down

2 changes: 1 addition & 1 deletion
tests/shared-client-testcases

Open in desktop


Submodule shared-client-testcases
updated

from 72675e to 32cb54


2 changes: 2 additions & 0 deletions
tests/test_con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,8 @@ class TestConUtils(unittest.TestCase):
 RuntimeError, 'cannot read credentials'),
 'invalid_dsn_or_instance_name': (
 ValueError, 'invalid DSN or instance name'),
 'invalid_instance_name': (
 ValueError, 'invalid instance name'),
 'invalid_dsn': (ValueError, 'invalid DSN'),
 'unix_socket_unsupported': (
 ValueError, 'unix socket paths not supported'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Update for rules of instance names#423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

fantix
merged 4 commits into

from

Mar 22, 2023
 Merged


Update for rules of instance names
#423
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
dd01087

Update for rules of instance names


fantix Mar 14, 2023
b2d2910

CRF: address code review comments


fantix Mar 15, 2023
f62b39a

update: ban underscores for the cloud


fantix Mar 20, 2023
9f77292

Update shared testcases


fantix Mar 22, 2023

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


48 changes: 32 additions & 16 deletions
edgedb/con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,18 @@
 r'((?:(?:\s|^)-\s*)?\d*\.?\d*)\s*(?i:us(\s|\d|\.|$)|microseconds?(\s|$))',
)
INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z_]\w*)(?:/([A-Za-z_]\w*))?$',
 r'^(\w(?:-?\w)*)$',
 re.ASCII,
)
CLOUD_INSTANCE_NAME_RE = re.compile(
 r'^([A-Za-z0-9](?:-?[A-Za-z0-9])*)/([A-Za-z0-9](?:-?[A-Za-z0-9])*)$',
 re.ASCII,
)
DSN_RE = re.compile(
 r'^[a-z]+://',
 re.IGNORECASE,
)
DOMAIN_LABEL_MAX_LENGTH = 63


class ClientConfiguration(typing.NamedTuple):
Expand DownExpand Up@@ -519,11 +529,10 @@ def _parse_connect_dsn_and_args(
):
 resolved_config = ResolvedConnectConfig()

 dsn, instance_name = (
 (dsn, None)
 if dsn is not None and re.match('(?i)^[a-z]+://', dsn)
 else (None, dsn)
 )
 if dsn and DSN_RE.match(dsn):
 instance_name = None
 else:
 instance_name, dsn = dsn, None

 has_compound_options = _resolve_config_options(
 resolved_config,
Expand DownExpand Up@@ -861,6 +870,13 @@ def _parse_cloud_instance_name_into_config(
 org_slug: str,
 instance_name: str,
):
 label = f"{instance_name}--{org_slug}"
 if len(label) > DOMAIN_LABEL_MAX_LENGTH:
 raise ValueError(
@elpranselpransMar 14, 2023

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.

Should probably be errors.InterfaceError or a subclass.
@fantixfantixMar 15, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

I'll create a new PR for this - too many of them to fix in a CRF.
 f"invalid instance name: cloud instance name length cannot exceed "
 f"{DOMAIN_LABEL_MAX_LENGTH - 1} characters: "
 f"{org_slug}/{instance_name}"
 )
 secret_key = resolved_config.secret_key
 if secret_key is None:
 try:
Expand DownExpand Up@@ -889,7 +905,7 @@ def _parse_cloud_instance_name_into_config(
 raise errors.ClientConnectionError("Invalid secret key")
 payload = f"{org_slug}/{instance_name}".encode("utf-8")
 dns_bucket = binascii.crc_hqx(payload, 0) % 100
 host = f"{instance_name}--{org_slug}.c-{dns_bucket:02d}.i.{dns_zone}"
 host = f"{label}.c-{dns_bucket:02d}.i.{dns_zone}"
 resolved_config.set_host(host, source)


Expand DownExpand Up@@ -973,23 +989,23 @@ def _resolve_config_options(
 else:
 creds = cred_utils.validate_credentials(cred_data)
 source = "credentials"
 elif INSTANCE_NAME_RE.match(instance_name[0]):
 source = instance_name[1]
 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 )
 else:
 name_match = INSTANCE_NAME_RE.match(instance_name[0])
 name_match = CLOUD_INSTANCE_NAME_RE.match(instance_name[0])
 if name_match is None:
 raise ValueError(
 f'invalid DSN or instance name: "{instance_name[0]}"'
 )
 source = instance_name[1]
 org, inst = name_match.groups()
 if inst is not None:
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 creds = cred_utils.read_credentials(
 cred_utils.get_credentials_path(instance_name[0]),
 _parse_cloud_instance_name_into_config(
 resolved_config, source, org, inst
 )
 return True

 resolved_config.set_host(creds.get('host'), source)
 resolved_config.set_port(creds.get('port'), source)
Expand Down

2 changes: 1 addition & 1 deletion
tests/shared-client-testcases

Open in desktop


Submodule shared-client-testcases
updated

from 72675e to 32cb54


2 changes: 2 additions & 0 deletions
tests/test_con_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,8 @@ class TestConUtils(unittest.TestCase):
 RuntimeError, 'cannot read credentials'),
 'invalid_dsn_or_instance_name': (
 ValueError, 'invalid DSN or instance name'),
 'invalid_instance_name': (
 ValueError, 'invalid instance name'),
 'invalid_dsn': (ValueError, 'invalid DSN'),
 'unix_socket_unsupported': (
 ValueError, 'unix socket paths not supported'),
Expand Down