sha
string
github
string
commit_message
string
git_diff
string
is_security
int64
e69378d7e82a503534d29c5939fa219341e8f2ad
https://github.com/fedora-selinux/setroubleshoot/commit/e69378d7e82a503534d29c5939fa219341e8f2ad
framework: Do not use dangerous shell=True
diff --git a/framework/NEWS b/framework/NEWS index f8f5ee7..f3b6173 100644 --- a/framework/NEWS +++ b/framework/NEWS @@ -1,3 +1,6 @@ +setroubleshoot 3.2.27 2016-06-21 + - Do not use dangerous shell=True + setroubleshoot 3.2.26.2 2016-06-03 - bugfix diff --git a/framework/configure.ac b/framework/configure.ac index dd0407c..bfeb7d0 100644 --- a/framework/configure.ac +++ b/framework/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([setroubleshoot], [3.2.26.2], +AC_INIT([setroubleshoot], [3.2.27], [http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=setroubleshoot]) AC_CONFIG_SRCDIR(src/setroubleshoot/__init__.py) diff --git a/framework/src/setroubleshoot/audit_data.py b/framework/src/setroubleshoot/audit_data.py index 4644de9..043d202 100644 --- a/framework/src/setroubleshoot/audit_data.py +++ b/framework/src/setroubleshoot/audit_data.py @@ -864,12 +864,10 @@ def _set_tpath(self): else: if path.startswith("/") == False and inodestr: import subprocess - command = "locate -b '\%s'" % path + command = ["locate", "-b", "\%s" % path] try: - output = subprocess.check_output(command, - stderr=subprocess.STDOUT, - shell=True) - ino = int(inodestr) + output = subprocess.check_output(command, + stderr=subprocess.STDOUT) for file in output.split("\n"): try: if int(os.lstat(file).st_ino) == ino: diff --git a/framework/src/setroubleshoot/signature.py b/framework/src/setroubleshoot/signature.py index 7e70bc4..eae517d 100755 --- a/framework/src/setroubleshoot/signature.py +++ b/framework/src/setroubleshoot/signature.py @@ -520,11 +520,11 @@ def format_details(self, replace=False): audit2allow = "/usr/bin/audit2allow" if os.path.exist(audit2allow): newbuf = "\n\naudit2allow" - p = Popen([audit2allow], shell=True,stdin=PIPE, stdout=PIPE) + p = Popen([audit2allow], stdin=PIPE, stdout=PIPE) newbuf += p.communicate(avcbuf)[0] if os.path.exists("/var/lib/sepolgen/interface_info"): newbuf += "\naudit2allow -R" - p = Popen(["%s -R" % audit2allow ], shell=True,stdin=PIPE, stdout=PIPE) + p = Popen([audit2allow, "-R"], stdin=PIPE, stdout=PIPE) newbuf += p.communicate(avcbuf)[0] avcbuf += newbuf except:
1
d907537c051212c4f87f2acc2bdb3738ecd0dba7
https://github.com/zxing/zxing/commit/d907537c051212c4f87f2acc2bdb3738ecd0dba7
Fix bug in decoding data URIs; Add tests in javase/, zxingorg/
diff --git a/javase/src/main/java/com/google/zxing/client/j2se/ImageReader.java b/javase/src/main/java/com/google/zxing/client/j2se/ImageReader.java index 0d7617cea4..323ece0c7a 100644 --- a/javase/src/main/java/com/google/zxing/client/j2se/ImageReader.java +++ b/javase/src/main/java/com/google/zxing/client/j2se/ImageReader.java @@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URI; -import java.net.URLDecoder; /** * Encapsulates reading URIs as images. @@ -60,8 +59,7 @@ public static BufferedImage readDataURIImage(URI uri) throws IOException { if (base64Start < 0) { throw new IOException("Unsupported data URI encoding"); } - String base64DataEncoded = uriString.substring(base64Start + BASE64TOKEN.length()); - String base64Data = URLDecoder.decode(base64DataEncoded, "UTF-8"); + String base64Data = uriString.substring(base64Start + BASE64TOKEN.length()); byte[] imageBytes = Base64Decoder.getInstance().decode(base64Data); return ImageIO.read(new ByteArrayInputStream(imageBytes)); } diff --git a/javase/src/test/java/com/google/zxing/client/j2se/DecodeWorkerTestCase.java b/javase/src/test/java/com/google/zxing/client/j2se/DecodeWorkerTestCase.java new file mode 100644 index 0000000000..83d9b959ee --- /dev/null +++ b/javase/src/test/java/com/google/zxing/client/j2se/DecodeWorkerTestCase.java @@ -0,0 +1,50 @@ +/* + * Copyright 2018 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.zxing.client.j2se; + +import com.beust.jcommander.JCommander; +import org.junit.Assert; +import org.junit.Test; + +import java.net.URI; +import java.util.Collections; +import java.util.LinkedList; +import java.util.Queue; + +/** + * Tests {@link DecodeWorker}. + */ +public final class DecodeWorkerTestCase extends Assert { + + private static final String IMAGE_DATA_URI = + "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhAQAAAAB/n//CAAAAkklEQVR42mP4DwQNDJjkB4" + + "E77A0M369N/d7A8CV6rjiQjPMFkWG1QPL7RVGg%2BAfREKCa/5/vA9V/nFSQ3sDwb7/KdiDJqX4dSH4pXN/A8DfyDVD2" + + "988HQPUfPVaqA0XKz%2BgD9bIk1AP1fgwvB7KlS9VBdqXbA82PT9AH2fiaH2SXGdDM71fDgeIfhIvKsbkTTAIAKYVr0N" + + "z5IloAAAAASUVORK5CYII="; + + + @Test + public void testWorker() throws Exception { + DecoderConfig config = new DecoderConfig(); + JCommander jCommander = new JCommander(config); + jCommander.parse("--pure_barcode", IMAGE_DATA_URI); + Queue<URI> inputs = new LinkedList<>(Collections.singletonList(new URI(IMAGE_DATA_URI))); + DecodeWorker worker = new DecodeWorker(config, inputs); + assertEquals(1, worker.call().intValue()); + } + +} diff --git a/javase/src/test/java/com/google/zxing/client/j2se/ImageReaderTestCase.java b/javase/src/test/java/com/google/zxing/client/j2se/ImageReaderTestCase.java index f8f3fe3594..bffc96c275 100644 --- a/javase/src/test/java/com/google/zxing/client/j2se/ImageReaderTestCase.java +++ b/javase/src/test/java/com/google/zxing/client/j2se/ImageReaderTestCase.java @@ -28,7 +28,7 @@ public final class ImageReaderTestCase extends Assert { @Test - public void testFoo() throws Exception { + public void testDataURI() throws Exception { String uri = "data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////w" + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6" + diff --git a/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/Generator.java b/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/Generator.java index 53cbd42518..be7cdb2288 100644 --- a/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/Generator.java +++ b/zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/Generator.java @@ -68,10 +68,9 @@ public void onModuleLoad() { setupLeftPanel(); topPanel.getElement().setId("leftpanel"); - Widget leftPanel = topPanel; HorizontalPanel mainPanel = new HorizontalPanel(); - mainPanel.add(leftPanel); + mainPanel.add(topPanel); SimplePanel div2 = new SimplePanel(); div2.add(result); diff --git a/zxingorg/src/main/java/com/google/zxing/web/DoSFilter.java b/zxingorg/src/main/java/com/google/zxing/web/DoSFilter.java index 69686ef793..5ccf5266d0 100644 --- a/zxingorg/src/main/java/com/google/zxing/web/DoSFilter.java +++ b/zxingorg/src/main/java/com/google/zxing/web/DoSFilter.java @@ -39,13 +39,17 @@ @WebFilter({"/w/decode", "/w/chart"}) public final class DoSFilter implements Filter { + static final int MAX_ACCESS_PER_TIME = 500; + static final long ACCESS_TIME_MS = TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES); + static final int MAX_ENTRIES = 10_000; + private Timer timer; private DoSTracker sourceAddrTracker; @Override public void init(FilterConfig filterConfig) { timer = new Timer("DoSFilter"); - sourceAddrTracker = new DoSTracker(timer, 500, TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES), 10_000); + sourceAddrTracker = new DoSTracker(timer, MAX_ACCESS_PER_TIME, ACCESS_TIME_MS, MAX_ENTRIES); timer.scheduleAtFixedRate( new TimerTask() { @Override diff --git a/zxingorg/src/main/java/com/google/zxing/web/DoSTracker.java b/zxingorg/src/main/java/com/google/zxing/web/DoSTracker.java index 2254fa5aaa..9884ea8af0 100644 --- a/zxingorg/src/main/java/com/google/zxing/web/DoSTracker.java +++ b/zxingorg/src/main/java/com/google/zxing/web/DoSTracker.java @@ -38,7 +38,7 @@ DoSTracker(Timer timer, final int maxAccessesPerTime, long accessTimeMS, int maxEntries) { this.maxAccessesPerTime = maxAccessesPerTime; this.numRecentAccesses = new LRUMap<>(maxEntries); - timer.scheduleAtFixedRate(new TimerTask() { + timer.schedule(new TimerTask() { @Override public void run() { synchronized (numRecentAccesses) { diff --git a/zxingorg/src/test/java/com/google/zxing/web/ChartServletRequestParametersTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/ChartServletRequestParametersTestCase.java new file mode 100644 index 0000000000..63ad779e5a --- /dev/null +++ b/zxingorg/src/test/java/com/google/zxing/web/ChartServletRequestParametersTestCase.java @@ -0,0 +1,42 @@ +/* + * Copyright 2018 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.zxing.web; + +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import org.junit.Assert; +import org.junit.Test; + +import java.nio.charset.StandardCharsets; + +/** + * Tests {@link ChartServletRequestParameters}. + */ +public final class ChartServletRequestParametersTestCase extends Assert { + + @Test + public void testParams() { + ChartServletRequestParameters params = + new ChartServletRequestParameters(10, 20, StandardCharsets.UTF_8, ErrorCorrectionLevel.H, 5, "foo"); + assertEquals(10, params.getWidth()); + assertEquals(20, params.getHeight()); + assertEquals(StandardCharsets.UTF_8, params.getOutputEncoding()); + assertEquals(ErrorCorrectionLevel.H, params.getEcLevel()); + assertEquals(5, params.getMargin()); + assertEquals("foo", params.getText()); + } + +} diff --git a/zxingorg/src/test/java/com/google/zxing/web/DoSFilterTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/DoSFilterTestCase.java new file mode 100644 index 0000000000..3fb4b72461 --- /dev/null +++ b/zxingorg/src/test/java/com/google/zxing/web/DoSFilterTestCase.java @@ -0,0 +1,48 @@ +/* + * Copyright 2018 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.zxing.web; + +import org.junit.Assert; +import org.junit.Test; +import org.springframework.mock.web.MockFilterChain; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; + +import javax.servlet.http.HttpServletResponse; + +/** + * Tests {@link DoSFilter}. + */ +public final class DoSFilterTestCase extends Assert { + + @Test + public void testRedirect() throws Exception { + MockHttpServletRequest request = new MockHttpServletRequest(); + request.setRequestURI("/"); + request.setRemoteAddr("1.2.3.4"); + MockHttpServletResponse response = new MockHttpServletResponse(); + DoSFilter filter = new DoSFilter(); + filter.init(null); + for (int i = 0; i < DoSFilter.MAX_ACCESS_PER_TIME; i++) { + filter.doFilter(request, response, new MockFilterChain()); + assertEquals(HttpServletResponse.SC_OK, response.getStatus()); + } + filter.doFilter(request, response, new MockFilterChain()); + assertEquals(HttpServletResponse.SC_FORBIDDEN, response.getStatus()); + } + +} diff --git a/zxingorg/src/test/java/com/google/zxing/web/DoSTrackerTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/DoSTrackerTestCase.java new file mode 100644 index 0000000000..95a87d1f27 --- /dev/null +++ b/zxingorg/src/test/java/com/google/zxing/web/DoSTrackerTestCase.java @@ -0,0 +1,58 @@ +/* + * Copyright 2018 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.zxing.web; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.Timer; + +/** + * Tests {@link DoSTracker}. + */ +public final class DoSTrackerTestCase extends Assert { + + @Test + public void testDoS() throws Exception { + Timer timer = new Timer(); + long timerTimeMS = 200; + DoSTracker tracker = new DoSTracker(timer, 2, timerTimeMS, 3); + assertFalse(tracker.isBanned("A")); + assertFalse(tracker.isBanned("A")); + assertTrue(tracker.isBanned("A")); + + assertFalse(tracker.isBanned("B")); + assertFalse(tracker.isBanned("C")); + assertFalse(tracker.isBanned("D")); + assertFalse(tracker.isBanned("A")); + + assertFalse(tracker.isBanned("A")); + assertTrue(tracker.isBanned("A")); + Thread.sleep(timerTimeMS * 3); + assertFalse(tracker.isBanned("A")); + + assertFalse(tracker.isBanned("A")); + assertTrue(tracker.isBanned("A")); + assertTrue(tracker.isBanned("A")); + assertTrue(tracker.isBanned("A")); + assertTrue(tracker.isBanned("A")); + assertTrue(tracker.isBanned("A")); + Thread.sleep(timerTimeMS * 2); + assertTrue(tracker.isBanned("A")); + } + +} diff --git a/zxingorg/src/test/java/com/google/zxing/web/HTTPSFilterTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/HTTPSFilterTestCase.java index 6db15f912a..344daf7aa3 100644 --- a/zxingorg/src/test/java/com/google/zxing/web/HTTPSFilterTestCase.java +++ b/zxingorg/src/test/java/com/google/zxing/web/HTTPSFilterTestCase.java @@ -42,7 +42,6 @@ public void setUp() { request.setRequestURI("/path"); response = new MockHttpServletResponse(); chain = new MockFilterChain(); - } @Test diff --git a/zxingorg/src/test/java/com/google/zxing/web/LRUMapTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/LRUMapTestCase.java new file mode 100644 index 0000000000..af4f02c2a4 --- /dev/null +++ b/zxingorg/src/test/java/com/google/zxing/web/LRUMapTestCase.java @@ -0,0 +1,39 @@ +/* + * Copyright 2018 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.zxing.web; + +import org.junit.Assert; +import org.junit.Test; + +/** + * Tests {@link LRUMap}. + */ +public final class LRUMapTestCase extends Assert { + + @Test + public void testLRU() { + LRUMap<String,String> map = new LRUMap<>(2); + map.put("foo", "bar"); + map.put("bar", "baz"); + assertEquals("bar", map.get("foo")); + assertEquals("baz", map.get("bar")); + map.put("baz", "bing"); + assertEquals("bing", map.get("baz")); + assertNull(map.get("foo")); + } + +} diff --git a/zxingorg/src/test/java/com/google/zxing/web/WelcomeFilterTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/WelcomeFilterTestCase.java new file mode 100644 index 0000000000..94b8d0eb4d --- /dev/null +++ b/zxingorg/src/test/java/com/google/zxing/web/WelcomeFilterTestCase.java @@ -0,0 +1,44 @@ +/* + * Copyright 2018 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.zxing.web; + +import com.google.common.net.HttpHeaders; +import org.junit.Assert; +import org.junit.Test; +import org.springframework.mock.web.MockFilterChain; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; + +import javax.servlet.http.HttpServletResponse; + +/** + * Tests {@link WelcomeFilter}. + */ +public final class WelcomeFilterTestCase extends Assert { + + @Test + public void testRedirect() { + MockHttpServletRequest request = new MockHttpServletRequest(); + request.setRequestURI("/"); + MockHttpServletResponse response = new MockHttpServletResponse(); + MockFilterChain chain = new MockFilterChain(); + new WelcomeFilter().doFilter(request, response, chain); + assertEquals(HttpServletResponse.SC_MOVED_PERMANENTLY, response.getStatus()); + assertEquals("/w/decode.jspx", response.getHeader(HttpHeaders.LOCATION)); + } + +}
0
dde4f518b033dfb05c5068a984a885ed9c2e313b
https://github.com/cthackers/adm-zip/commit/dde4f518b033dfb05c5068a984a885ed9c2e313b
Node v6
diff --git a/package.json b/package.json index ec892c5..6e84372 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "url": "https://github.com/cthackers/adm-zip.git" }, "engines": { - "node": ">=0.3.0" + "node": ">=6.0" }, "devDependencies": { "chai": "^4.1.2", diff --git a/util/fattr.js b/util/fattr.js index b56fbd7..be47676 100644 --- a/util/fattr.js +++ b/util/fattr.js @@ -26,8 +26,8 @@ module.exports = function(/*String*/path) { _obj.directory = _stat.isDirectory(); _obj.mtime = _stat.mtime; _obj.atime = _stat.atime; - _obj.executable = !!(1 & parseInt ((_stat.mode & parseInt ("777", 8)).toString (8)[0])); - _obj.readonly = !!(2 & parseInt ((_stat.mode & parseInt ("777", 8)).toString (8)[0])); + _obj.executable = (0o111 & _stat.mode) != 0; // file is executable who ever har right not just owner + _obj.readonly = (0o200 & _stat.mode) == 0; // readonly if owner has no write right _obj.hidden = pth.basename(_path)[0] === "."; } else { console.warn("Invalid path: " + _path)
0
c9a231d
https://github.com/joyent/node/commit/c9a231d
typo in node_http_parser
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc index 8d9000d9d70..bc3da82b200 100644 --- a/src/node_http_parser.cc +++ b/src/node_http_parser.cc @@ -191,7 +191,7 @@ struct StringPtr { void Update(const char* str, size_t size) { if (str_ == NULL) str_ = str; - else if (on_heap_ || str_ + size != str) { + else if (on_heap_ || str_ + size_ != str) { // Non-consecutive input, make a copy on the heap. // TODO Use slab allocation, O(n) allocs is bad. char* s = new char[size_ + size];
1
f3f25e7839031b8fa1bde6d79f75cc3db834d928
https://github.com/openSUSE/kiwi/commit/f3f25e7839031b8fa1bde6d79f75cc3db834d928
- v7.04.46 released
diff --git a/modules/KIWIGlobals.pm b/modules/KIWIGlobals.pm index f8a71baca..c4f16a7f1 100644 --- a/modules/KIWIGlobals.pm +++ b/modules/KIWIGlobals.pm @@ -2045,7 +2045,7 @@ sub _new_instance { # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.04.45"; + $data{Version} = "7.04.46"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff --git a/rpm/kiwi.spec b/rpm/kiwi.spec index 37612fecf..39558f95c 100644 --- a/rpm/kiwi.spec +++ b/rpm/kiwi.spec @@ -36,7 +36,7 @@ Url: http://github.com/openSUSE/kiwi Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.04.45 +Version: 7.04.46 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc
0
874859493bbda59739c38c7e52eb3625f247b93
https://github.com/spring-projects/spring-framework/commit/874859493bbda59739c38c7e52eb3625f247b93
Deprecate JSONP and disable it by default in Jackson view Issue: SPR-16798
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java index 4832ec0bd676..09b678413ae1 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,6 +88,7 @@ public void setPrefixJson(boolean prefixJson) { @Override + @SuppressWarnings("deprecation") protected void writePrefix(JsonGenerator generator, Object object) throws IOException { if (this.jsonPrefix != null) { generator.writeRaw(this.jsonPrefix); @@ -101,6 +102,7 @@ protected void writePrefix(JsonGenerator generator, Object object) throws IOExce } @Override + @SuppressWarnings("deprecation") protected void writeSuffix(JsonGenerator generator, Object object) throws IOException { String jsonpFunction = (object instanceof MappingJacksonValue ? ((MappingJacksonValue) object).getJsonpFunction() : null); diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonValue.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonValue.java index 016fe94a0129..af80f4a3e782 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonValue.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -108,14 +108,20 @@ public FilterProvider getFilters() { /** * Set the name of the JSONP function name. + * @deprecated Will be removed as of Spring Framework 5.1, use + * <a href="https://docs.spring.io/spring/docs/4.3.x/spring-framework-reference/html/cors.html">CORS</a> instead. */ + @Deprecated public void setJsonpFunction(String functionName) { this.jsonpFunction = functionName; } /** * Return the configured JSONP function name. + * @deprecated Will be removed as of Spring Framework 5.1, use + * <a href="https://docs.spring.io/spring/docs/4.3.x/spring-framework-reference/html/cors.html">CORS</a> instead. */ + @Deprecated public String getJsonpFunction() { return this.jsonpFunction; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractJsonpResponseBodyAdvice.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractJsonpResponseBodyAdvice.java index 0a383c6c57e1..0a8beee06d85 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractJsonpResponseBodyAdvice.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractJsonpResponseBodyAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,10 @@ * * @author Rossen Stoyanchev * @since 4.1 + * @deprecated Will be removed as of Spring Framework 5.1, use + * <a href="https://docs.spring.io/spring/docs/4.3.x/spring-framework-reference/html/cors.html">CORS</a> instead. */ +@Deprecated public abstract class AbstractJsonpResponseBodyAdvice extends AbstractMappingJacksonResponseBodyAdvice { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java index 12a5baa0c2b2..c8853596e079 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package org.springframework.web.servlet.view.json; import java.io.IOException; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashSet; @@ -58,6 +57,7 @@ * @author Sebastien Deleuze * @since 3.1.2 */ +@SuppressWarnings("deprecation") public class MappingJackson2JsonView extends AbstractJackson2View { /** @@ -68,7 +68,10 @@ /** * Default content type for JSONP: "application/javascript". + * @deprecated Will be removed as of Spring Framework 5.1, use + * <a href="https://docs.spring.io/spring/docs/4.3.x/spring-framework-reference/html/cors.html">CORS</a> instead. */ + @Deprecated public static final String DEFAULT_JSONP_CONTENT_TYPE = "application/javascript"; /** @@ -83,7 +86,7 @@ private boolean extractValueFromSingleKeyModel = false; - private Set<String> jsonpParameterNames = new LinkedHashSet<String>(Arrays.asList("jsonp", "callback")); + private Set<String> jsonpParameterNames = new LinkedHashSet<String>(); /** @@ -168,7 +171,10 @@ public void setExtractValueFromSingleKeyModel(boolean extractValueFromSingleKeyM * <p>The parameter names configured by default are "jsonp" and "callback". * @since 4.1 * @see <a href="http://en.wikipedia.org/wiki/JSONP">JSONP Wikipedia article</a> + * @deprecated Will be removed as of Spring Framework 5.1, use + * <a href="https://docs.spring.io/spring/docs/4.3.x/spring-framework-reference/html/cors.html">CORS</a> instead. */ + @Deprecated public void setJsonpParameterNames(Set<String> jsonpParameterNames) { this.jsonpParameterNames = jsonpParameterNames; } @@ -198,7 +204,10 @@ private String getJsonpParameterValue(HttpServletRequest request) { * Invalid parameter values are ignored. * @param value the query param value, never {@code null} * @since 4.1.8 + * @deprecated Will be removed as of Spring Framework 5.1, use + * <a href="https://docs.spring.io/spring/docs/4.3.x/spring-framework-reference/html/cors.html">CORS</a> instead. */ + @Deprecated protected boolean isValidJsonpQueryParam(String value) { return CALLBACK_PARAM_PATTERN.matcher(value).matches(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java index 4e062b2a0055..b6346ec96cea 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,11 @@ package org.springframework.web.servlet.view.json; import java.io.IOException; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -324,11 +326,19 @@ public void renderSimpleBeanWithFilters() throws Exception { @Test public void renderWithJsonp() throws Exception { + testJsonp("jsonp", "callback", false); + testJsonp("jsonp", "_callback", false); + testJsonp("jsonp", "_Call.bAcK", false); + testJsonp("jsonp", "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_.", false); + testJsonp("jsonp", "<script>", false); + testJsonp("jsonp", "!foo!bar", false); + + this.view.setJsonpParameterNames(new LinkedHashSet<String>(Arrays.asList("jsonp"))); + testJsonp("jsonp", "callback", true); testJsonp("jsonp", "_callback", true); testJsonp("jsonp", "_Call.bAcK", true); testJsonp("jsonp", "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_.", true); - testJsonp("jsonp", "<script>", false); testJsonp("jsonp", "!foo!bar", false); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportType.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportType.java index 78b844240e2d..88dc84717717 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportType.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,8 @@ /** * SockJS transport types. * + * <p>JSONP support will be removed as of Spring Framework 5.1, use others transports instead. + * * @author Rossen Stoyanchev * @author Sebastien Deleuze * @since 4.0 @@ -39,8 +41,10 @@ XHR_SEND("xhr_send", HttpMethod.POST, "cors", "jsessionid", "no_cache"), + @Deprecated JSONP("jsonp", HttpMethod.GET, "jsessionid", "no_cache"), + @Deprecated JSONP_SEND("jsonp_send", HttpMethod.POST, "jsessionid", "no_cache"), XHR_STREAMING("xhr_streaming", HttpMethod.POST, "cors", "jsessionid", "no_cache"), diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java index 5f2200e05a3d..943df161ec05 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,6 +78,7 @@ public DefaultSockJsService(TaskScheduler scheduler, Collection<TransportHandler } + @SuppressWarnings("deprecation") private static Set<TransportHandler> getDefaultTransportHandlers(Collection<TransportHandler> overrides) { Set<TransportHandler> result = new LinkedHashSet<TransportHandler>(8); result.add(new XhrPollingTransportHandler()); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpPollingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpPollingTransportHandler.java index 5385d3961363..8de05960d3ab 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpPollingTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpPollingTransportHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,9 @@ * * @author Rossen Stoyanchev * @since 4.0 + * @deprecated Will be removed as of Spring Framework 5.1, use others transports instead. */ +@Deprecated public class JsonpPollingTransportHandler extends AbstractHttpSendingTransportHandler { @Override diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpReceivingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpReceivingTransportHandler.java index f889cd75e9fc..2c69353f2e9d 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpReceivingTransportHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpReceivingTransportHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,9 @@ * A {@link TransportHandler} that receives messages over HTTP. * * @author Rossen Stoyanchev + * @deprecated Will be removed as of Spring Framework 5.1, use others transports instead. */ +@Deprecated public class JsonpReceivingTransportHandler extends AbstractHttpReceivingTransportHandler { private final FormHttpMessageConverter formConverter = new FormHttpMessageConverter(); diff --git a/src/asciidoc/web-mvc.adoc b/src/asciidoc/web-mvc.adoc index 1a86876bbb9d..96327923cf17 100644 --- a/src/asciidoc/web-mvc.adoc +++ b/src/asciidoc/web-mvc.adoc @@ -2291,6 +2291,12 @@ For controllers relying on view resolution, JSONP is automatically enabled when request has a query parameter named `jsonp` or `callback`. Those names can be customized through `jsonpParameterNames` property. +[NOTE] +==== +As of Spring Framework 4.3.18, JSONP support is deprecated and will be removed as of +Spring Framework 5.1, <<cors,CORS>> should be used instead. +==== + [[mvc-ann-async]] === Asynchronous Request Processing diff --git a/src/asciidoc/web-view.adoc b/src/asciidoc/web-view.adoc index 5d5123305db1..56d46919c5a4 100644 --- a/src/asciidoc/web-view.adoc +++ b/src/asciidoc/web-view.adoc @@ -2683,9 +2683,10 @@ annotations. When further control is needed, a custom `ObjectMapper` can be inje through the `ObjectMapper` property for cases where custom JSON serializers/deserializers need to be provided for specific types. -http://en.wikipedia.org/wiki/JSONP[JSONP] is supported and automatically enabled when -the request has a query parameter named `jsonp` or `callback`. The JSONP query parameter -name(s) could be customized through the `jsonpParameterNames` property. +As of Spring Framework 4.3.18, http://en.wikipedia.org/wiki/JSONP[JSONP] support is +deprecated and requires to customize the JSONP query parameter +name(s) through the `jsonpParameterNames` property. This support will be removed as of +Spring Framework 5.1, <<cors,CORS>> should be used instead.
1
2003b5d8bc9c9b2b7aa72f4d3c4532c7349264cd
https://github.com/pfsense/pfsense/commit/2003b5d8bc9c9b2b7aa72f4d3c4532c7349264cd
Print a warning on the login screen if you are accessing the router by a non-local IP address (one not configured on the system) to warn about potential MITM attacks.
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc index b3cd6a6293e..07474524de0 100644 --- a/etc/inc/authgui.inc +++ b/etc/inc/authgui.inc @@ -163,6 +163,24 @@ function display_login_form() { exit; } +/* Check against locally configured IP addresses, which will catch when someone + port forwards WebGUI access from WAN to an internal IP on the router. */ +global $FilterIflist; +$local_ip = false; +if(strstr($_SERVER['HTTP_HOST'], ":")) { + $http_host_port = explode(":", $_SERVER['HTTP_HOST']); + $http_host = $http_host_port[0]; +} else { + $http_host = $_SERVER['HTTP_HOST']; +} +if (empty($FilterIflist)) { + require_once('filter.inc'); + require_once('shaper.inc'); + filter_generate_optcfg_array(); +} +foreach ($FilterIflist as $iflist) + if($iflist['ip'] == $http_host) + $local_ip = true; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -198,6 +216,8 @@ function display_login_form() { </head> <body onload="page_load()"> <div id="login"> + <?php if(is_ipaddr($http_host) && !$local_ip) + print_info_box(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. <br/><br/>If you did not setup this forwarding, you may be the target of a man-in-the-middle attack.")); ?> <form id="iform" name="login_iform" method="post" autocomplete="off" action="<?=$_SERVER['SCRIPT_NAME'];?>"> <h1></h1> <div id="inputerrors"><?=$_SESSION['Login_Error'];?></div>
1
fd1c866ed05507eac9bec00244e0d530b61559e6
https://github.com/zmartzone/mod_auth_openidc/commit/fd1c866ed05507eac9bec00244e0d530b61559e6
add a pointer to Discussions to the Issue template Signed-off-by: Hans Zandbelt <[email protected]>
diff --git a/.github/issue_template.md b/.github/issue_template.md index cfadcc92..904ad796 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -1,3 +1,4 @@ -THIS ISSUER TRACKER IS NO LONGER USED! -DON'T CREATE ANY NEW ISSUES AS THEY WILL BE CLOSED IMMEDIATELY AS INVALID! -QUESTIONS SHOULD GO TO THE MAILINGLIST AT: [email protected] +This issue tracker is not for end users! +Don't create any new issues as they will immediately be closed as invalid. +Questions and discussions are at: https://github.com/zmartzone/mod_auth_openidc/discussions +There's also a user mailing list at: [email protected]
0
c2ad29317072a0ece9850a1dba13e03f0db6bc4c
https://github.com/restlet/restlet-framework-java/commit/c2ad29317072a0ece9850a1dba13e03f0db6bc4c
Update README.md
diff --git a/README.md b/README.md index c45db938ed..98c6676f71 100644 --- a/README.md +++ b/README.md @@ -8,21 +8,21 @@ It is available in editions for all major platforms (Java SE/EE, Google App Engi It is available under the terms of either the Apache Software License 2.0 or the Eclipse Public License 1.0. -http://restlet.com +http://restlet.talend.com ## Learn more To learn more about Restlet Framework, please have a look at the following resources: -* [User Guide](https://restlet.com/open-source/documentation/user-guide/2.4) -* [Tutorials](https://restlet.com/open-source/documentation/tutorials/2.4) -* [JavaDocs](https://restlet.com/open-source/documentation/javadocs/2.4) -* [Change Log](https://restlet.com/open-source/documentation/2.4/changelog) -* [Download](https://restlet.com/open-source/downloads/current/) +* [User Guide](https://restlet.talend.com/documentation/user-guide/2.4/) +* [Tutorials](https://restlet.talend.com/documentation/tutorials/2.4/) +* [JavaDocs](https://restlet.talend.com/documentation/javadocs/2.4/) +* [Change Log](https://restlet.talend.com/documentation/2.4/changelog) +* [Download](https://restlet.talend.com/downloads/current/) * [Issue Tracker](https://github.com/restlet/restlet-framework-java/issues) * [Mailing List](https://groups.google.com/a/restlet.org/forum/#!forum/framework-discuss) * [Stack Overflow](http://stackoverflow.com/questions/tagged/restlet) -Copyright 2005-2019 Talend +Copyright 2019 Talend [![Build Status](https://travis-ci.org/restlet/restlet-framework-java.svg?branch=2.4)](https://travis-ci.org/restlet/restlet-framework-java)
0
e3852a24eb994e3acc63551c99766e2fdd91bcdf
https://github.com/apache/storm/commit/e3852a24eb994e3acc63551c99766e2fdd91bcdf
STORM-3641 upgrade metrics API for JCQueue
diff --git a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/JCQueuePerfTest.java b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/JCQueuePerfTest.java index 13d880b0aa6..1843755235e 100644 --- a/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/JCQueuePerfTest.java +++ b/examples/storm-perf/src/main/java/org/apache/storm/perf/queuetest/JCQueuePerfTest.java @@ -18,11 +18,10 @@ package org.apache.storm.perf.queuetest; -import java.util.concurrent.locks.LockSupport; +import java.util.Collections; import org.apache.storm.metrics2.StormMetricRegistry; import org.apache.storm.policy.WaitStrategyPark; import org.apache.storm.utils.JCQueue; -import org.apache.storm.utils.MutableLong; @SuppressWarnings("checkstyle:AbbreviationAsWordInName") public class JCQueuePerfTest { @@ -48,8 +47,8 @@ public static void main(String[] args) throws Exception { private static void ackingProducerSimulation() { WaitStrategyPark ws = new WaitStrategyPark(100); StormMetricRegistry registry = new StormMetricRegistry(); - JCQueue spoutQ = new JCQueue("spoutQ", 1024, 0, 100, ws, "test", "test", 1000, 1000, registry); - JCQueue ackQ = new JCQueue("ackQ", 1024, 0, 100, ws, "test", "test", 1000, 1000, registry); + JCQueue spoutQ = new JCQueue("spoutQ", 1024, 0, 100, ws, "test", "test", Collections.singletonList(1000), 1000, registry); + JCQueue ackQ = new JCQueue("ackQ", 1024, 0, 100, ws, "test", "test", Collections.singletonList(1000), 1000, registry); final AckingProducer ackingProducer = new AckingProducer(spoutQ, ackQ); final Acker acker = new Acker(ackQ, spoutQ); @@ -60,8 +59,9 @@ private static void ackingProducerSimulation() { private static void producerFwdConsumer(int prodBatchSz) { WaitStrategyPark ws = new WaitStrategyPark(100); StormMetricRegistry registry = new StormMetricRegistry(); - JCQueue q1 = new JCQueue("q1", 1024, 0, prodBatchSz, ws, "test", "test", 1000, 1000, registry); - JCQueue q2 = new JCQueue("q2", 1024, 0, prodBatchSz, ws, "test", "test", 1000, 1000, registry); + JCQueue q1 = new JCQueue("q1", 1024, 0, prodBatchSz, ws, "test", "test", + Collections.singletonList(1000), 1000, registry); + JCQueue q2 = new JCQueue("q2", 1024, 0, prodBatchSz, ws, "test", "test", Collections.singletonList(1000), 1000, registry); final Producer prod = new Producer(q1); final Forwarder fwd = new Forwarder(q1, q2); @@ -72,8 +72,8 @@ private static void producerFwdConsumer(int prodBatchSz) { private static void oneProducer1Consumer(int prodBatchSz) { - JCQueue q1 = new JCQueue("q1", 50_000, 0, prodBatchSz, new WaitStrategyPark(100), "test", "test", 1000, 1000, - new StormMetricRegistry()); + JCQueue q1 = new JCQueue("q1", 50_000, 0, prodBatchSz, new WaitStrategyPark(100), "test", "test", + Collections.singletonList(1000), 1000, new StormMetricRegistry()); final Producer prod1 = new Producer(q1); final Consumer cons1 = new Consumer(q1); @@ -82,8 +82,8 @@ private static void oneProducer1Consumer(int prodBatchSz) { } private static void twoProducer1Consumer(int prodBatchSz) { - JCQueue q1 = new JCQueue("q1", 50_000, 0, prodBatchSz, new WaitStrategyPark(100), "test", "test", 1000, 1000, - new StormMetricRegistry()); + JCQueue q1 = new JCQueue("q1", 50_000, 0, prodBatchSz, new WaitStrategyPark(100), "test", "test", + Collections.singletonList(1000), 1000, new StormMetricRegistry()); final Producer prod1 = new Producer(q1); final Producer prod2 = new Producer(q1); @@ -93,8 +93,8 @@ private static void twoProducer1Consumer(int prodBatchSz) { } private static void threeProducer1Consumer(int prodBatchSz) { - JCQueue q1 = new JCQueue("q1", 50_000, 0, prodBatchSz, new WaitStrategyPark(100), "test", "test", 1000, 1000, - new StormMetricRegistry()); + JCQueue q1 = new JCQueue("q1", 50_000, 0, prodBatchSz, new WaitStrategyPark(100), "test", "test", + Collections.singletonList(1000), 1000, new StormMetricRegistry()); final Producer prod1 = new Producer(q1); final Producer prod2 = new Producer(q1); @@ -108,8 +108,8 @@ private static void threeProducer1Consumer(int prodBatchSz) { private static void oneProducer2Consumers(int prodBatchSz) { WaitStrategyPark ws = new WaitStrategyPark(100); StormMetricRegistry registry = new StormMetricRegistry(); - JCQueue q1 = new JCQueue("q1", 1024, 0, prodBatchSz, ws, "test", "test", 1000, 1000, registry); - JCQueue q2 = new JCQueue("q2", 1024, 0, prodBatchSz, ws, "test", "test", 1000, 1000, registry); + JCQueue q1 = new JCQueue("q1", 1024, 0, prodBatchSz, ws, "test", "test", Collections.singletonList(1000), 1000, registry); + JCQueue q2 = new JCQueue("q2", 1024, 0, prodBatchSz, ws, "test", "test", Collections.singletonList(1000), 1000, registry); final Producer2 prod1 = new Producer2(q1, q2); final Consumer cons1 = new Consumer(q1); diff --git a/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java b/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java index 2d72e782325..72d660ffb76 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/metrics/BuiltinMetricsUtil.java @@ -49,14 +49,6 @@ public Object getValueAndReset() { registerMetric("__send-iconnection", metric, topoConf, context); } - public static void registerQueueMetrics(Map<String, JCQueue> queues, Map<String, Object> topoConf, TopologyContext context) { - for (Map.Entry<String, JCQueue> entry : queues.entrySet()) { - String name = "__" + entry.getKey(); - IMetric metric = new StateMetric(entry.getValue()); - registerMetric(name, metric, topoConf, context); - } - } - public static void registerMetric(String name, IMetric metric, Map<String, Object> topoConf, TopologyContext context) { int bucketSize = ((Number) topoConf.get(Config.TOPOLOGY_BUILTIN_METRICS_BUCKET_SIZE_SECS)).intValue(); context.registerMetric(name, metric, bucketSize); diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java index eaab4e91c4c..70840aceb56 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java @@ -240,11 +240,6 @@ public WorkerState(Map<String, Object> conf, this.receiver = this.mqContext.bind(topologyId, port, cb, newConnectionResponse); } - private static double getQueueLoad(JCQueue queue) { - JCQueue.QueueMetrics queueMetrics = queue.getMetrics(); - return ((double) queueMetrics.population()) / queueMetrics.capacity(); - } - public static boolean isConnectionReady(IConnection connection) { return !(connection instanceof ConnectionWithStatus) || ((ConnectionWithStatus) connection).status() == ConnectionWithStatus.Status.Ready; @@ -475,7 +470,7 @@ public void refreshLoad(List<IRunningExecutor> execs) { Set<Integer> remoteTasks = Sets.difference(new HashSet<>(outboundTasks), new HashSet<>(localTaskIds)); Map<Integer, Double> localLoad = new HashMap<>(); for (IRunningExecutor exec : execs) { - double receiveLoad = getQueueLoad(exec.getReceiveQueue()); + double receiveLoad = exec.getReceiveQueue().getQueueLoad(); localLoad.put(exec.getExecutorId().get(0).intValue(), receiveLoad); } @@ -683,10 +678,10 @@ private Assignment getLocalAssignment(IStormClusterState stormClusterState, Stri IWaitStrategy backPressureWaitStrategy = IWaitStrategy.createBackPressureWaitStrategy(topologyConf); Map<List<Long>, JCQueue> receiveQueueMap = new HashMap<>(); for (List<Long> executor : executors) { - int port = this.getPort(); + List<Integer> taskIds = StormCommon.executorIdToTasks(executor); receiveQueueMap.put(executor, new JCQueue("receive-queue" + executor.toString(), recvQueueSize, overflowLimit, recvBatchSize, backPressureWaitStrategy, - this.getTopologyId(), Constants.SYSTEM_COMPONENT_ID, -1, this.getPort(), metricRegistry)); + this.getTopologyId(), Constants.SYSTEM_COMPONENT_ID, taskIds, this.getPort(), metricRegistry)); } return receiveQueueMap; diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerTransfer.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerTransfer.java index 88f5921eb54..916850e62e0 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerTransfer.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerTransfer.java @@ -18,6 +18,7 @@ package org.apache.storm.daemon.worker; +import java.util.Collections; import java.util.Map; import java.util.Queue; import java.util.concurrent.atomic.AtomicBoolean; @@ -66,7 +67,7 @@ } this.transferQueue = new JCQueue("worker-transfer-queue", xferQueueSz, 0, xferBatchSz, backPressureWaitStrategy, - workerState.getTopologyId(), Constants.SYSTEM_COMPONENT_ID, -1, workerState.getPort(), + workerState.getTopologyId(), Constants.SYSTEM_COMPONENT_ID, Collections.singletonList(-1), workerState.getPort(), workerState.getMetricRegistry()); } diff --git a/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java b/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java index dd62e6aa5b6..68ea9da2649 100644 --- a/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java @@ -122,9 +122,6 @@ public void init(ArrayList<Task> idToTask, int idToTaskBase) throws InterruptedE ((ICredentialsListener) boltObject).setCredentials(credentials); } if (Constants.SYSTEM_COMPONENT_ID.equals(componentId)) { - Map<String, JCQueue> map = ImmutableMap.of("receive", receiveQueue, "transfer", workerData.getTransferQueue()); - BuiltinMetricsUtil.registerQueueMetrics(map, topoConf, userContext); - Map<NodeInfo, IConnection> cachedNodePortToSocket = workerData.getCachedNodeToPortSocket().get(); BuiltinMetricsUtil.registerIconnectionClientMetrics(cachedNodePortToSocket, topoConf, userContext); BuiltinMetricsUtil.registerIconnectionServerMetric(workerData.getReceiver(), topoConf, userContext); @@ -138,9 +135,6 @@ public void init(ArrayList<Task> idToTask, int idToTaskBase) throws InterruptedE } } } - } else { - Map<String, JCQueue> map = ImmutableMap.of("receive", receiveQueue); - BuiltinMetricsUtil.registerQueueMetrics(map, topoConf, userContext); } this.outputCollector = new BoltOutputCollectorImpl(this, taskData, rand, hasEventLoggers, ackingEnabled, isDebug); diff --git a/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java b/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java index cb2af7f98e3..6f4d7ddd07e 100644 --- a/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java @@ -140,8 +140,6 @@ public void expire(Long key, TupleInfo tupleInfo) { this.outputCollectors.add(outputCollector); builtInMetrics.registerAll(topoConf, taskData.getUserContext()); - Map<String, JCQueue> map = ImmutableMap.of("receive", receiveQueue); - BuiltinMetricsUtil.registerQueueMetrics(map, topoConf, taskData.getUserContext()); if (spoutObject instanceof ICredentialsListener) { ((ICredentialsListener) spoutObject).setCredentials(credentials); diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/JcMetrics.java b/storm-client/src/jvm/org/apache/storm/metrics2/JcMetrics.java deleted file mode 100644 index 82b9d13568d..00000000000 --- a/storm-client/src/jvm/org/apache/storm/metrics2/JcMetrics.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version - * 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - */ - -package org.apache.storm.metrics2; - -import org.apache.storm.utils.JCQueue; - -public class JcMetrics { - private final SimpleGauge<Long> capacity; - private final SimpleGauge<Long> population; - - JcMetrics(SimpleGauge<Long> capacity, - SimpleGauge<Long> population) { - this.capacity = capacity; - this.population = population; - } - - public void setCapacity(Long capacity) { - this.capacity.set(capacity); - } - - public void setPopulation(Long population) { - this.population.set(population); - } - - public void set(JCQueue.QueueMetrics metrics) { - this.capacity.set(metrics.capacity()); - this.population.set(metrics.population()); - } -} diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java b/storm-client/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java index 34017061bdd..4d62cf484f9 100644 --- a/storm-client/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java +++ b/storm-client/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java @@ -67,10 +67,11 @@ return gauge; } - public JcMetrics jcMetrics(String name, String topologyId, String componentId, Integer taskId, Integer port) { - SimpleGauge<Long> capacityGauge = gauge(0L, name + "-capacity", topologyId, componentId, taskId, port); - SimpleGauge<Long> populationGauge = gauge(0L, name + "-population", topologyId, componentId, taskId, port); - return new JcMetrics(capacityGauge, populationGauge); + public <T> Gauge<T> gauge(String name, Gauge<T> gauge, String topologyId, String componentId, Integer taskId, Integer port) { + MetricNames metricNames = workerMetricName(name, topologyId, componentId, taskId, port); + gauge = registry.register(metricNames.getLongName(), gauge); + saveMetricTaskIdMapping(taskId, metricNames, gauge, taskIdGauges); + return gauge; } public Meter meter(String name, WorkerTopologyContext context, String componentId, Integer taskId, String streamId) { diff --git a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java index b0f2d9f886a..4a40f8230ab 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java +++ b/storm-client/src/jvm/org/apache/storm/utils/JCQueue.java @@ -20,17 +20,9 @@ import java.io.Closeable; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; -import org.apache.storm.metric.api.IStatefulObject; -import org.apache.storm.metric.internal.RateTracker; -import org.apache.storm.metrics2.JcMetrics; +import java.util.List; import org.apache.storm.metrics2.StormMetricRegistry; import org.apache.storm.policy.IWaitStrategy; -import org.apache.storm.shade.com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.storm.shade.org.jctools.queues.MessagePassingQueue; import org.apache.storm.shade.org.jctools.queues.MpscArrayQueue; import org.apache.storm.shade.org.jctools.queues.MpscUnboundedArrayQueue; @@ -38,17 +30,10 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("checkstyle:AbbreviationAsWordInName") -public class JCQueue implements IStatefulObject, Closeable { +public class JCQueue implements Closeable { private static final Logger LOG = LoggerFactory.getLogger(JCQueue.class); - private static final String PREFIX = "jc-"; - private static final ScheduledThreadPoolExecutor METRICS_REPORTER_EXECUTOR = - new ScheduledThreadPoolExecutor(1, - new ThreadFactoryBuilder() - .setDaemon(true) - .setNameFormat(PREFIX + "metrics-reporter") - .build()); private final ExitCondition continueRunning = () -> true; - private final JcMetrics jcMetrics; + private final List<JCQueueMetrics> jcqMetrics = new ArrayList<>(); private final MpscArrayQueue<Object> recvQueue; // only holds msgs from other workers (via WorkerTransfer), when recvQueue is full private final MpscUnboundedArrayQueue<Object> overflowQ; @@ -56,32 +41,24 @@ private final int producerBatchSz; private final DirectInserter directInserter = new DirectInserter(this); private final ThreadLocal<BatchInserter> thdLocalBatcher = new ThreadLocal<BatchInserter>(); // ensure 1 instance per producer thd. - private final JCQueue.QueueMetrics metrics; private final IWaitStrategy backPressureWaitStrategy; private final String queueName; public JCQueue(String queueName, int size, int overflowLimit, int producerBatchSz, IWaitStrategy backPressureWaitStrategy, - String topologyId, String componentId, Integer taskId, int port, StormMetricRegistry metricRegistry) { + String topologyId, String componentId, List<Integer> taskIds, int port, StormMetricRegistry metricRegistry) { this.queueName = queueName; this.overflowLimit = overflowLimit; this.recvQueue = new MpscArrayQueue<>(size); this.overflowQ = new MpscUnboundedArrayQueue<>(size); - this.metrics = new JCQueue.QueueMetrics(); - this.jcMetrics = metricRegistry.jcMetrics(queueName, topologyId, componentId, taskId, port); + for (Integer taskId : taskIds) { + this.jcqMetrics.add(new JCQueueMetrics(queueName, topologyId, componentId, taskId, port, + metricRegistry, recvQueue, overflowQ)); + } //The batch size can be no larger than half the full recvQueue size, to avoid contention issues. this.producerBatchSz = Math.max(1, Math.min(producerBatchSz, size / 2)); this.backPressureWaitStrategy = backPressureWaitStrategy; - - if (!METRICS_REPORTER_EXECUTOR.isShutdown()) { - METRICS_REPORTER_EXECUTOR.scheduleAtFixedRate(new Runnable() { - @Override - public void run() { - jcMetrics.set(metrics); - } - }, 15, 15, TimeUnit.SECONDS); - } } public String getName() { @@ -90,9 +67,9 @@ public String getName() { @Override public void close() { - //No need to block, the task run by the executor is safe to run even after metrics are closed - METRICS_REPORTER_EXECUTOR.shutdown(); - metrics.close(); + for (JCQueueMetrics jcQueueMetric : jcqMetrics) { + jcQueueMetric.close(); + } } /** @@ -118,6 +95,10 @@ public int size() { return recvQueue.size() + overflowQ.size(); } + public double getQueueLoad() { + return ((double) recvQueue.size()) / recvQueue.capacity(); + } + /** * Non blocking. Returns immediately if Q is empty. Returns number of elements consumed from Q. */ @@ -149,7 +130,9 @@ private int consumeImpl(Consumer consumer, ExitCondition exitCond) throws Interr // Non Blocking. returns true/false indicating success/failure. Fails if full. private boolean tryPublishInternal(Object obj) { if (recvQueue.offer(obj)) { - metrics.notifyArrivals(1); + for (JCQueueMetrics jcQueueMetric : jcqMetrics) { + jcQueueMetric.notifyArrivals(1); + } return true; } return false; @@ -167,7 +150,9 @@ public Object get() { } }; int count = recvQueue.fill(supplier, objs.size()); - metrics.notifyArrivals(count); + for (JCQueueMetrics jcQueueMetric : jcqMetrics) { + jcQueueMetric.notifyArrivals(count); + } return count; } @@ -221,7 +206,9 @@ public boolean tryPublishToOverflow(Object obj) { } public void recordMsgDrop() { - getMetrics().notifyDroppedMsg(); + for (JCQueueMetrics jcQueueMetric : jcqMetrics) { + jcQueueMetric.notifyDroppedMsg(); + } } public boolean isEmptyOverflow() { @@ -254,16 +241,6 @@ public boolean tryFlush() { return inserter.tryFlush(); } - @Override - public Object getState() { - return metrics.getState(); - } - - //This method enables the metrics to be accessed from outside of the JCQueue class - public JCQueue.QueueMetrics getMetrics() { - return metrics; - } - private interface Inserter { // blocking call that can be interrupted using Thread.interrupt() void publish(Object obj) throws InterruptedException; @@ -301,7 +278,9 @@ public void publish(Object obj) throws InterruptedException { boolean inserted = queue.tryPublishInternal(obj); int idleCount = 0; while (!inserted) { - queue.metrics.notifyInsertFailure(); + for (JCQueueMetrics jcQueueMetric : queue.jcqMetrics) { + jcQueueMetric.notifyInsertFailure(); + } if (idleCount == 0) { // check avoids multiple log msgs when in a idle loop LOG.debug("Experiencing Back Pressure on recvQueue: '{}'. Entering BackPressure Wait", queue.getName()); } @@ -322,7 +301,9 @@ public void publish(Object obj) throws InterruptedException { public boolean tryPublish(Object obj) { boolean inserted = queue.tryPublishInternal(obj); if (!inserted) { - queue.metrics.notifyInsertFailure(); + for (JCQueueMetrics jcQueueMetric : queue.jcqMetrics) { + jcQueueMetric.notifyInsertFailure(); + } return false; } return true; @@ -387,7 +368,9 @@ public void flush() throws InterruptedException { int publishCount = queue.tryPublishInternal(currentBatch); int retryCount = 0; while (publishCount == 0) { // retry till at least 1 element is drained - queue.metrics.notifyInsertFailure(); + for (JCQueueMetrics jcQueueMetric : queue.jcqMetrics) { + jcQueueMetric.notifyInsertFailure(); + } if (retryCount == 0) { // check avoids multiple log msgs when in a idle loop LOG.debug("Experiencing Back Pressure when flushing batch to Q: {}. Entering BackPressure Wait.", queue.getName()); } @@ -411,7 +394,9 @@ public boolean tryFlush() { } int publishCount = queue.tryPublishInternal(currentBatch); if (publishCount == 0) { - queue.metrics.notifyInsertFailure(); + for (JCQueueMetrics jcQueueMetric : queue.jcqMetrics) { + jcQueueMetric.notifyInsertFailure(); + } return false; } else { currentBatch.subList(0, publishCount).clear(); @@ -419,67 +404,4 @@ public boolean tryFlush() { } } } // class BatchInserter - - /** - * This inner class provides methods to access the metrics of the JCQueue. - */ - public class QueueMetrics implements Closeable { - private final RateTracker arrivalsTracker = new RateTracker(10000, 10); - private final RateTracker insertFailuresTracker = new RateTracker(10000, 10); - private final AtomicLong droppedMessages = new AtomicLong(0); - - public long population() { - return recvQueue.size(); - } - - public long capacity() { - return recvQueue.capacity(); - } - - public Object getState() { - Map<String, Object> state = new HashMap<>(); - - final double arrivalRateInSecs = arrivalsTracker.reportRate(); - - long tuplePop = population(); - - // Assume the recvQueue is stable, in which the arrival rate is equal to the consumption rate. - // If this assumption does not hold, the calculation of sojourn time should also consider - // departure rate according to Queuing Theory. - final double sojournTime = tuplePop / Math.max(arrivalRateInSecs, 0.00001) * 1000.0; - - long cap = capacity(); - float pctFull = (1.0F * tuplePop / cap); - - state.put("capacity", cap); - state.put("pct_full", pctFull); - state.put("population", tuplePop); - - state.put("arrival_rate_secs", arrivalRateInSecs); - state.put("sojourn_time_ms", sojournTime); //element sojourn time in milliseconds - state.put("insert_failures", insertFailuresTracker.reportRate()); - state.put("dropped_messages", droppedMessages); - state.put("overflow", overflowQ.size()); - return state; - } - - public void notifyArrivals(long counts) { - arrivalsTracker.notify(counts); - } - - public void notifyInsertFailure() { - insertFailuresTracker.notify(1); - } - - public void notifyDroppedMsg() { - droppedMessages.incrementAndGet(); - } - - @Override - public void close() { - arrivalsTracker.close(); - insertFailuresTracker.close(); - } - - } } \ No newline at end of file diff --git a/storm-client/src/jvm/org/apache/storm/utils/JCQueueMetrics.java b/storm-client/src/jvm/org/apache/storm/utils/JCQueueMetrics.java new file mode 100644 index 00000000000..eec5b3385c3 --- /dev/null +++ b/storm-client/src/jvm/org/apache/storm/utils/JCQueueMetrics.java @@ -0,0 +1,125 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package org.apache.storm.utils; + +import com.codahale.metrics.Gauge; +import java.io.Closeable; +import java.util.concurrent.atomic.AtomicLong; +import org.apache.storm.metric.internal.RateTracker; +import org.apache.storm.metrics2.StormMetricRegistry; +import org.apache.storm.shade.org.jctools.queues.MpscArrayQueue; +import org.apache.storm.shade.org.jctools.queues.MpscUnboundedArrayQueue; + +@SuppressWarnings("checkstyle:AbbreviationAsWordInName") +public class JCQueueMetrics implements Closeable { + private final RateTracker arrivalsTracker = new RateTracker(10000, 10); + private final RateTracker insertFailuresTracker = new RateTracker(10000, 10); + private final AtomicLong droppedMessages = new AtomicLong(0); + + public JCQueueMetrics(String queueName, String topologyId, String componentId, int taskId, int port, + StormMetricRegistry metricRegistry, MpscArrayQueue<Object> receiveQ, + MpscUnboundedArrayQueue<Object> overflowQ) { + + Gauge<Integer> cap = new Gauge<Integer>() { + @Override + public Integer getValue() { + return receiveQ.capacity(); + } + }; + + Gauge<Float> pctFull = new Gauge<Float>() { + @Override + public Float getValue() { + return (1.0F * receiveQ.size() / receiveQ.capacity()); + } + }; + + Gauge<Integer> pop = new Gauge<Integer>() { + @Override + public Integer getValue() { + return receiveQ.size(); + } + }; + + Gauge<Double> arrivalRate = new Gauge<Double>() { + @Override + public Double getValue() { + return arrivalsTracker.reportRate(); + } + }; + + Gauge<Double> sojourn = new Gauge<Double>() { + @Override + public Double getValue() { + // Assume the recvQueue is stable, in which the arrival rate is equal to the consumption rate. + // If this assumption does not hold, the calculation of sojourn time should also consider + // departure rate according to Queuing Theory. + return receiveQ.size() / Math.max(arrivalsTracker.reportRate(), 0.00001) * 1000.0; + } + }; + + Gauge<Double> insertFailures = new Gauge<Double>() { + @Override + public Double getValue() { + return insertFailuresTracker.reportRate(); + } + }; + + Gauge<Long> dropped = new Gauge<Long>() { + @Override + public Long getValue() { + return droppedMessages.get(); + } + }; + + Gauge<Integer> overflow = new Gauge<Integer>() { + @Override + public Integer getValue() { + return overflowQ.size(); + } + }; + + metricRegistry.gauge(queueName + "-capacity", cap, topologyId, componentId, taskId, port); + metricRegistry.gauge(queueName + "-pct_full", pctFull, topologyId, componentId, taskId, port); + metricRegistry.gauge(queueName + "-population", pop, topologyId, componentId, taskId, port); + metricRegistry.gauge(queueName + "-arrival_rate_secs", arrivalRate, topologyId, componentId, taskId, port); + metricRegistry.gauge(queueName + "-sojourn_time_ms", sojourn, topologyId, componentId, taskId, port); + metricRegistry.gauge(queueName + "-insert_failures", insertFailures, topologyId, componentId, taskId, port); + metricRegistry.gauge(queueName + "-dropped_messages", dropped, topologyId, componentId, taskId, port); + metricRegistry.gauge(queueName + "-overflow", overflow, topologyId, componentId, taskId, port); + } + + public void notifyArrivals(long counts) { + arrivalsTracker.notify(counts); + } + + public void notifyInsertFailure() { + insertFailuresTracker.notify(1); + } + + public void notifyDroppedMsg() { + droppedMessages.incrementAndGet(); + } + + @Override + public void close() { + arrivalsTracker.close(); + insertFailuresTracker.close(); + } +} diff --git a/storm-client/test/jvm/org/apache/storm/utils/JCQueueBackpressureTest.java b/storm-client/test/jvm/org/apache/storm/utils/JCQueueBackpressureTest.java index 2cfe25d9f67..07a9123a351 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/JCQueueBackpressureTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/JCQueueBackpressureTest.java @@ -12,17 +12,17 @@ package org.apache.storm.utils; +import java.util.Collections; import org.apache.storm.metrics2.StormMetricRegistry; import org.apache.storm.policy.WaitStrategyPark; import org.apache.storm.utils.JCQueue.Consumer; import org.junit.Assert; import org.junit.Test; - public class JCQueueBackpressureTest { private static JCQueue createQueue(String name, int queueSize) { - return new JCQueue(name, queueSize, 0, 1, new WaitStrategyPark(0), "test", "test", 1000, 1000, new StormMetricRegistry()); + return new JCQueue(name, queueSize, 0, 1, new WaitStrategyPark(0), "test", "test", Collections.singletonList(1000), 1000, new StormMetricRegistry()); } @Test diff --git a/storm-client/test/jvm/org/apache/storm/utils/JCQueueTest.java b/storm-client/test/jvm/org/apache/storm/utils/JCQueueTest.java index 0d597fcf955..4a98937e219 100644 --- a/storm-client/test/jvm/org/apache/storm/utils/JCQueueTest.java +++ b/storm-client/test/jvm/org/apache/storm/utils/JCQueueTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertFalse; import java.time.Duration; +import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.apache.storm.metrics2.StormMetricRegistry; @@ -21,7 +22,6 @@ import org.apache.storm.policy.WaitStrategyPark; import org.junit.Assert; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; public class JCQueueTest { @@ -157,7 +157,7 @@ private JCQueue createQueue(String name, int queueSize) { } private JCQueue createQueue(String name, int batchSize, int queueSize) { - return new JCQueue(name, queueSize, 0, batchSize, waitStrategy, "test", "test", 1000, 1000, new StormMetricRegistry()); + return new JCQueue(name, queueSize, 0, batchSize, waitStrategy, "test", "test", Collections.singletonList(1000), 1000, new StormMetricRegistry()); } private static class IncProducer implements Runnable {
0
dcf67c4433bfe4177595be7c5ae68ae4c308e835
https://github.com/php/php-src/commit/dcf67c4433bfe4177595be7c5ae68ae4c308e835
This option enables administrators to make their users invulnerable to attacks which involve passing session ids in URLs.
diff --git a/ext/session/php_session.h b/ext/session/php_session.h index c458b11b56335..01d8fc4d6daba 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -113,6 +113,7 @@ typedef struct _php_ps_globals { zval *http_session_vars; zend_bool auto_start; zend_bool use_cookies; + zend_bool use_only_cookies; zend_bool use_trans_sid; /* contains the INI value of whether to use trans-sid */ zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the current request */ } php_ps_globals; diff --git a/ext/session/session.c b/ext/session/session.c index 849725a4c4834..7e3ea9befe3ae 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -131,6 +131,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("session.cookie_domain", "", PHP_INI_ALL, OnUpdateString, cookie_domain, php_ps_globals, ps_globals) STD_PHP_INI_BOOLEAN("session.cookie_secure", "", PHP_INI_ALL, OnUpdateBool, cookie_secure, php_ps_globals, ps_globals) STD_PHP_INI_BOOLEAN("session.use_cookies", "1", PHP_INI_ALL, OnUpdateBool, use_cookies, php_ps_globals, ps_globals) + STD_PHP_INI_BOOLEAN("session.use_only_cookies", "0", PHP_INI_ALL, OnUpdateBool, use_only_cookies, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.referer_check", "", PHP_INI_ALL, OnUpdateString, extern_referer_chk, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.entropy_file", "", PHP_INI_ALL, OnUpdateString, entropy_file, php_ps_globals, ps_globals) STD_PHP_INI_ENTRY("session.entropy_length", "0", PHP_INI_ALL, OnUpdateInt, entropy_length, php_ps_globals, ps_globals) @@ -839,7 +840,7 @@ PHPAPI void php_session_start(TSRMLS_D) define_sid = 0; } - if (!PS(id) && + if (!PS(use_only_cookies) && !PS(id) && zend_hash_find(&EG(symbol_table), "_GET", sizeof("_GET"), (void **) &data) == SUCCESS && Z_TYPE_PP(data) == IS_ARRAY && @@ -849,7 +850,7 @@ PHPAPI void php_session_start(TSRMLS_D) send_cookie = 0; } - if (!PS(id) && + if (!PS(use_only_cookies) && !PS(id) && zend_hash_find(&EG(symbol_table), "_POST", sizeof("_POST"), (void **) &data) == SUCCESS && Z_TYPE_PP(data) == IS_ARRAY && @@ -864,7 +865,7 @@ PHPAPI void php_session_start(TSRMLS_D) '<session-name>=<session-id>' to allow URLs of the form http://yoursite/<session-name>=<session-id>/script.php */ - if (!PS(id) && + if (!PS(use_only_cookies) && !PS(id) && zend_hash_find(&EG(symbol_table), "REQUEST_URI", sizeof("REQUEST_URI"), (void **) &data) == SUCCESS && Z_TYPE_PP(data) == IS_STRING &&
1
6016948ea535e51b16535888af13df064a1a15d3
https://github.com/shirasagi/shirasagi/commit/6016948ea535e51b16535888af13df064a1a15d3
[fix] sns/login: close open redirect (#2061)
diff --git a/app/controllers/concerns/sns/login_filter.rb b/app/controllers/concerns/sns/login_filter.rb index 16529482fce..3db18985633 100644 --- a/app/controllers/concerns/sns/login_filter.rb +++ b/app/controllers/concerns/sns/login_filter.rb @@ -22,7 +22,7 @@ def default_logged_in_path def login_success if params[:ref].blank? redirect_to default_logged_in_path - elsif params[:ref] =~ /^\// + elsif params[:ref] =~ /^\/[^\/]/ redirect_to params[:ref] else render "sns/login/redirect"
1
78e7b83fbefba46be40d024cf4baf0ff4337b13e
https://github.com/monstra-cms/monstra/commit/78e7b83fbefba46be40d024cf4baf0ff4337b13e
Merge branch 'dev'
diff --git a/.htaccess b/.htaccess index 3293165d..31ad65c9 100644 --- a/.htaccess +++ b/.htaccess @@ -59,5 +59,10 @@ AddDefaultCharset UTF-8 Satisfy All </FilesMatch> +# Allow read files. +<Files robots.txt> + Allow from all +</Files> + # Don't show directory listings for URLs which map to a directory. Options -Indexes diff --git a/CHANGELOG.md b/CHANGELOG.md index d1cc771c..989d0457 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Monstra 3.0.4, 2016-04-05 +------------------------ +- Fixed User Security by adding a check that compares POST id with SESSION +id for none admin edits +- Fixed ability to read robots.txt +- Stylesheet: Changed minified URIs to eliminate query strings + + Monstra 3.0.3, 2016-01-29 ------------------------ - Improved Monstra Security diff --git a/engine/Monstra.php b/engine/Monstra.php index 3f26cc81..b1a50fb7 100644 --- a/engine/Monstra.php +++ b/engine/Monstra.php @@ -31,7 +31,7 @@ class Monstra /** * The version of Monstra */ - const VERSION = '3.0.3'; + const VERSION = '3.0.4'; /** diff --git a/engine/Plugin/Javascript.php b/engine/Plugin/Javascript.php index 57072c8c..5126f98f 100644 --- a/engine/Plugin/Javascript.php +++ b/engine/Plugin/Javascript.php @@ -59,7 +59,7 @@ public static function add($file, $load = 'frontend', $priority = 10) public static function load() { $backend_site_js_path = MINIFY . DS . 'backend_site.minify.js'; - $frontend_site_js_path = MINIFY . DS . 'frontend_site.minify.js'; + $frontend_site_js_path = MINIFY . DS . 'frontend_site.minify.'.Option::get('javascript_version').'.js'; // Load javascripts if (count(Javascript::$javascripts) > 0) { @@ -122,7 +122,7 @@ public static function load() if (BACKEND) { echo '<script type="text/javascript" src="'.Option::get('siteurl').'/tmp/minify/backend_site.minify.js?'.Option::get('javascript_version').'"></script>'; } else { - echo '<script type="text/javascript" src="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.js?'.Option::get('javascript_version').'"></script>'."\n"; + echo '<script type="text/javascript" src="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.'.Option::get('javascript_version').'.js"></script>'."\n"; } } } diff --git a/engine/Plugin/Stylesheet.php b/engine/Plugin/Stylesheet.php index 214374da..4907805b 100644 --- a/engine/Plugin/Stylesheet.php +++ b/engine/Plugin/Stylesheet.php @@ -59,7 +59,7 @@ public static function add($file, $load = 'frontend', $priority = 10) public static function load() { $backend_site_css_path = MINIFY . DS . 'backend_site.minify.css'; - $frontend_site_css_path = MINIFY . DS . 'frontend_site.minify.css'; + $frontend_site_css_path = MINIFY . DS . 'frontend_site.minify.'.Option::get('styles_version').'.css'; // Load stylesheets if (count(Stylesheet::$stylesheets) > 0) { @@ -124,7 +124,7 @@ public static function load() if (BACKEND) { echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/backend_site.minify.css?'.Option::get('styles_version').'" type="text/css" />'; } else { - echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.css?'.Option::get('styles_version').'" type="text/css" />'."\n"; + echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.'.Option::get('styles_version').'.css" type="text/css" />'."\n"; } } } diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php index 2ff9a2af..b41520ca 100644 --- a/plugins/box/users/users.plugin.php +++ b/plugins/box/users/users.plugin.php @@ -228,27 +228,32 @@ public static function getProfileEdit($id) // Check csrf if (Security::check(Request::post('csrf'))) { - - if (Security::safeName(Request::post('login')) != '') { - if (Users::$users->update(Request::post('user_id'), - array('login' => Security::safeName(Request::post('login')), - 'firstname' => Request::post('firstname'), - 'lastname' => Request::post('lastname'), - 'email' => Request::post('email'), - 'skype' => Request::post('skype'), - 'about_me' => Request::post('about_me'), - 'twitter' => Request::post('twitter')))) { - - // Change password - if (trim(Request::post('new_password')) != '') { - Users::$users->update(Request::post('user_id'), array('password' => Security::encryptPassword(trim(Request::post('new_password'))))); + + // Check for POST data manipulation + if( ((int) Session::get('user_id') == (int) Request::post('user_id')) or (in_array(Session::get('user_role'), array('admin'))) ) { + + if (Security::safeName(Request::post('login')) != '') { + if (Users::$users->update(Request::post('user_id'), + array('login' => Security::safeName(Request::post('login')), + 'firstname' => Request::post('firstname'), + 'lastname' => Request::post('lastname'), + 'email' => Request::post('email'), + 'skype' => Request::post('skype'), + 'about_me' => Request::post('about_me'), + 'twitter' => Request::post('twitter')))) { + + // Change password + if (trim(Request::post('new_password')) != '') { + Users::$users->update(Request::post('user_id'), array('password' => Security::encryptPassword(trim(Request::post('new_password'))))); + } + + Notification::set('success', __('Your changes have been saved.', 'users')); + Request::redirect(Site::url().'/users/'.$user['id']); } - - Notification::set('success', __('Your changes have been saved.', 'users')); - Request::redirect(Site::url().'/users/'.$user['id']); - } - } else { } - + } else { } + + } else { die('Monstra says: This is not your profile...'); } + } else { die('Request was denied because it contained an invalid security token. Please refresh the page and try again.'); } }
0
e5903f70831a5e362d2bec79a520eb35c0dd90c4
https://github.com/jnicklas/merb-core/commit/e5903f70831a5e362d2bec79a520eb35c0dd90c4
A bit more readable spec example titles. Follow one assertion per test rule.
diff --git a/spec/public/controller/base_spec.rb b/spec/public/controller/base_spec.rb index 738e3314..e6e49f8e 100644 --- a/spec/public/controller/base_spec.rb +++ b/spec/public/controller/base_spec.rb @@ -9,13 +9,17 @@ end end - it "should not have any callable actions by default" do + it "has no any callable actions by default" do Merb::Controller.callable_actions.should be_empty end - it "should dispatch to callable actions" do + it "sets body on dispatch to callable action" do controller = dispatch_to(Merb::Test::Fixtures::Controllers::Base, :index) controller.body.should == "index" + end + + it "sets status on dispatch to callable action" do + controller = dispatch_to(Merb::Test::Fixtures::Controllers::Base, :index) controller.status.should == 200 end @@ -33,4 +37,4 @@ should raise_error(Merb::ControllerExceptions::ActionNotFound) end -end \ No newline at end of file +end
0
5682ef8d40569afd00fb9a5933e7706bb5b66713
https://github.com/vmware/xenon/commit/5682ef8d40569afd00fb9a5933e7706bb5b66713
Add auth to UtilityService Extend auth check to UtiliyService endpoints: stats, config, subscription Issue: VRXEN-5 Change-Id: I52a4b4a42731c244a97f97610dcaddb6837e67fb
diff --git a/xenon-common/src/main/java/com/vmware/xenon/common/UtilityService.java b/xenon-common/src/main/java/com/vmware/xenon/common/UtilityService.java index 23c9f05e5..39378486a 100644 --- a/xenon-common/src/main/java/com/vmware/xenon/common/UtilityService.java +++ b/xenon-common/src/main/java/com/vmware/xenon/common/UtilityService.java @@ -144,7 +144,29 @@ public UtilityService setParent(Service parent) { @Override public void authorizeRequest(Operation op) { - op.complete(); + + String suffix = UriUtils.buildUriPath(UriUtils.URI_PATH_CHAR, UriUtils.getLastPathSegment(op.getUri())); + + // allow access to ui endpoint + if (ServiceHost.SERVICE_URI_SUFFIX_UI.equals(suffix)) { + op.complete(); + return; + } + + ServiceDocument doc = new ServiceDocument(); + if (this.parent.getOptions().contains(ServiceOption.FACTORY_ITEM)) { + doc.documentSelfLink = UriUtils.buildUriPath(UriUtils.getParentPath(this.parent.getSelfLink()), suffix); + } else { + doc.documentSelfLink = UriUtils.buildUriPath(this.parent.getSelfLink(), suffix); + } + + doc.documentKind = Utils.buildKind(this.parent.getStateType()); + if (getHost().isAuthorized(this.parent, doc, op)) { + op.complete(); + return; + } + + op.fail(Operation.STATUS_CODE_FORBIDDEN); } @Override diff --git a/xenon-common/src/test/java/com/vmware/xenon/common/TestAuthorization.java b/xenon-common/src/test/java/com/vmware/xenon/common/TestAuthorization.java index bfdaa2082..56b045b57 100644 --- a/xenon-common/src/test/java/com/vmware/xenon/common/TestAuthorization.java +++ b/xenon-common/src/test/java/com/vmware/xenon/common/TestAuthorization.java @@ -462,16 +462,20 @@ public void guestAuthorization() throws Throwable { .setBody(state)); assertEquals(Operation.STATUS_CODE_UNAUTHORIZED, failureResponse.op.getStatusCode()); + OperationContext.setAuthorizationContext(this.host.getSystemAuthorizationContext()); Map<String, ServiceStats.ServiceStat> stat = this.host.getServiceStats( UriUtils.buildUri(this.host, ServiceUriPaths.CORE_MANAGEMENT)); double currentInsertCount = stat.get( ServiceHostManagementService.STAT_NAME_AUTHORIZATION_CACHE_INSERT_COUNT).latestValue; + OperationContext.setAuthorizationContext(null); // Make a second request and verify that the cache did not get updated, instead Xenon re-used // the cached Guest authorization context. sender.sendAndWait(Operation.createGet(this.host, ExampleService.FACTORY_LINK)); + OperationContext.setAuthorizationContext(this.host.getSystemAuthorizationContext()); stat = this.host.getServiceStats( UriUtils.buildUri(this.host, ServiceUriPaths.CORE_MANAGEMENT)); + OperationContext.setAuthorizationContext(null); double newInsertCount = stat.get( ServiceHostManagementService.STAT_NAME_AUTHORIZATION_CACHE_INSERT_COUNT).latestValue; assertTrue(currentInsertCount == newInsertCount); @@ -709,6 +713,16 @@ public void statefulServiceAuthorization() throws Throwable { })); this.host.testWait(ctx2); + // do GET on factory /stats, we should get 403 + Operation statsGet = Operation.createGet(this.host, + ExampleService.FACTORY_LINK + ServiceHost.SERVICE_URI_SUFFIX_STATS); + this.host.sendAndWaitExpectFailure(statsGet, Operation.STATUS_CODE_FORBIDDEN); + + // do GET on factory /config, we should get 403 + Operation configGet = Operation.createGet(this.host, + ExampleService.FACTORY_LINK + ServiceHost.SERVICE_URI_SUFFIX_CONFIG); + this.host.sendAndWaitExpectFailure(configGet, Operation.STATUS_CODE_FORBIDDEN); + // Assume Jane's identity this.host.assumeIdentity(this.userServicePath); // add docs accessible by jane @@ -750,9 +764,27 @@ public void statefulServiceAuthorization() throws Throwable { // reset the auth context OperationContext.setAuthorizationContext(null); + // do GET on utility suffixes in example child services, we should get 403 + for (URI childUri : exampleServices.keySet()) { + statsGet = Operation.createGet(this.host, + childUri.getPath() + ServiceHost.SERVICE_URI_SUFFIX_STATS); + this.host.sendAndWaitExpectFailure(statsGet, Operation.STATUS_CODE_FORBIDDEN); + configGet = Operation.createGet(this.host, + childUri.getPath() + ServiceHost.SERVICE_URI_SUFFIX_CONFIG); + this.host.sendAndWaitExpectFailure(configGet, Operation.STATUS_CODE_FORBIDDEN); + } + // Assume Jane's identity through header auth token String authToken = generateAuthToken(this.userServicePath); + // do GET on utility suffixes in example child services, we should get 200 + for (URI childUri : exampleServices.keySet()) { + statsGet = Operation.createGet(this.host, + childUri.getPath() + ServiceHost.SERVICE_URI_SUFFIX_STATS); + statsGet.addRequestHeader(Operation.REQUEST_AUTH_TOKEN_HEADER, authToken); + this.host.sendAndWaitExpectSuccess(statsGet); + } + verifyJaneAccess(exampleServices, authToken); // test user impersonation diff --git a/xenon-common/src/test/java/com/vmware/xenon/common/TestExampleServiceHost.java b/xenon-common/src/test/java/com/vmware/xenon/common/TestExampleServiceHost.java index 572d816cb..a3fd5a2c8 100644 --- a/xenon-common/src/test/java/com/vmware/xenon/common/TestExampleServiceHost.java +++ b/xenon-common/src/test/java/com/vmware/xenon/common/TestExampleServiceHost.java @@ -81,10 +81,6 @@ public void createUsers() throws Throwable { * isn't created immediately, so this polls. */ private String loginUser(URI hostUri) throws Throwable { - URI usersLink = UriUtils.buildUri(hostUri, UserService.FACTORY_LINK); - // wait for factory availability - this.host.waitForReplicatedFactoryServiceAvailable(usersLink); - String basicAuth = BasicAuthenticationUtils.constructBasicAuth(adminUser, adminUser); URI loginUri = UriUtils.buildUri(hostUri, ServiceUriPaths.CORE_AUTHN_BASIC); AuthenticationRequest login = new AuthenticationRequest(); diff --git a/xenon-common/src/test/java/com/vmware/xenon/common/TestServiceHost.java b/xenon-common/src/test/java/com/vmware/xenon/common/TestServiceHost.java index ca1ad1a89..b78a7e850 100644 --- a/xenon-common/src/test/java/com/vmware/xenon/common/TestServiceHost.java +++ b/xenon-common/src/test/java/com/vmware/xenon/common/TestServiceHost.java @@ -421,9 +421,13 @@ private void doRequestRateLimits() throws Throwable { ri.limit = limit; ri.options = EnumSet.of(RequestRateInfo.Option.PAUSE_PROCESSING); this.host.setRequestRateLimit(userPath, ri); - this.host.assumeIdentity(userPath); + this.host.setSystemAuthorizationContext(); ServiceStat rateLimitStatBefore = getRateLimitOpCountStat(); + this.host.resetSystemAuthorizationContext(); + + this.host.assumeIdentity(userPath); + if (rateLimitStatBefore == null) { rateLimitStatBefore = new ServiceStat(); rateLimitStatBefore.latestValue = 0.0; @@ -442,7 +446,10 @@ private void doRequestRateLimits() throws Throwable { } this.host.testWait(ctx2); ctx2.logAfter(); + + this.host.setSystemAuthorizationContext(); ServiceStat rateLimitStatAfter = getRateLimitOpCountStat(); + this.host.resetSystemAuthorizationContext(); assertTrue(rateLimitStatAfter.latestValue > rateLimitStatBefore.latestValue); this.host.setMaintenanceIntervalMicros( @@ -472,7 +479,9 @@ private void doRequestRateLimits() throws Throwable { ctx3.logAfter(); // verify rate limiting did not happen + this.host.setSystemAuthorizationContext(); ServiceStat rateLimitStatExpectSame = getRateLimitOpCountStat(); + this.host.resetSystemAuthorizationContext(); assertTrue(rateLimitStatAfter.latestValue == rateLimitStatExpectSame.latestValue); } @@ -2627,8 +2636,9 @@ private ServiceStat getODLStopCountStat() throws Throwable { private ServiceStat getRateLimitOpCountStat() throws Throwable { URI managementServiceUri = this.host.getManagementServiceUri(); - return this.host.getServiceStats(managementServiceUri) + ServiceStat stats = this.host.getServiceStats(managementServiceUri) .get(ServiceHostManagementService.STAT_NAME_RATE_LIMITED_OP_COUNT); + return stats; } @Test diff --git a/xenon-common/src/test/java/com/vmware/xenon/common/TestSubscriptions.java b/xenon-common/src/test/java/com/vmware/xenon/common/TestSubscriptions.java index 209d33e4b..66ab78170 100644 --- a/xenon-common/src/test/java/com/vmware/xenon/common/TestSubscriptions.java +++ b/xenon-common/src/test/java/com/vmware/xenon/common/TestSubscriptions.java @@ -300,11 +300,14 @@ public void subscriptionsWithAuth() throws Throwable { } }; + + hostWithAuth.setSystemAuthorizationContext(); Operation subscribe = Operation.createPost(UriUtils.buildUri(hostWithAuth, minimalServiceUUID)); subscribe.setReferer(hostWithAuth.getReferer()); ServiceSubscriber subscriber = new ServiceSubscriber(); subscriber.replayState = true; hostWithAuth.startSubscriptionService(subscribe, notifyC, subscriber); + hostWithAuth.resetAuthorizationContext(); hostWithAuth.testWait(notifyContext); } finally { if (hostWithAuth != null) { diff --git a/xenon-common/src/test/java/com/vmware/xenon/common/TestUtilityService.java b/xenon-common/src/test/java/com/vmware/xenon/common/TestUtilityService.java index a031bcb90..f281dc5db 100644 --- a/xenon-common/src/test/java/com/vmware/xenon/common/TestUtilityService.java +++ b/xenon-common/src/test/java/com/vmware/xenon/common/TestUtilityService.java @@ -14,8 +14,12 @@ package com.vmware.xenon.common; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import static com.vmware.xenon.common.ServiceHost.SERVICE_URI_SUFFIX_TEMPLATE; +import static com.vmware.xenon.common.ServiceHost.SERVICE_URI_SUFFIX_UI; + import java.net.URI; import java.util.ArrayList; import java.util.EnumSet; @@ -34,10 +38,16 @@ import com.vmware.xenon.common.ServiceStats.TimeSeriesStats; import com.vmware.xenon.common.ServiceStats.TimeSeriesStats.AggregationType; import com.vmware.xenon.common.ServiceStats.TimeSeriesStats.TimeBin; +import com.vmware.xenon.common.test.AuthTestUtils; import com.vmware.xenon.common.test.TestContext; +import com.vmware.xenon.common.test.TestRequestSender; +import com.vmware.xenon.common.test.TestRequestSender.FailureResponse; +import com.vmware.xenon.common.test.VerificationHost; +import com.vmware.xenon.services.common.AuthorizationContextService; import com.vmware.xenon.services.common.ExampleService; import com.vmware.xenon.services.common.ExampleService.ExampleServiceState; import com.vmware.xenon.services.common.MinimalTestService; +import com.vmware.xenon.services.common.QueryTask.Query; import com.vmware.xenon.services.common.ServiceUriPaths; public class TestUtilityService extends BasicReusableHostTestCase { @@ -823,4 +833,144 @@ public void statsKeyOrder() { assertEquals("stat index 2", "keyCCC", statList.get(2)); } + @Test + public void endpointAuthorization() throws Throwable { + VerificationHost host = VerificationHost.create(0); + host.setAuthorizationService(new AuthorizationContextService()); + host.setAuthorizationEnabled(true); + host.setMaintenanceIntervalMicros(TimeUnit.MILLISECONDS.toMicros(100)); + host.start(); + + TestRequestSender sender = host.getTestRequestSender(); + + host.setSystemAuthorizationContext(); + host.waitForReplicatedFactoryServiceAvailable(UriUtils.buildUri(host, ExampleService.FACTORY_LINK)); + + String exampleUser = "[email protected]"; + String examplePass = "password"; + TestContext authCtx = host.testCreate(1); + AuthorizationSetupHelper.create() + .setHost(host) + .setUserEmail(exampleUser) + .setUserPassword(examplePass) + .setResourceQuery(Query.Builder.create() + .addFieldClause(ServiceDocument.FIELD_NAME_KIND, Utils.buildKind(ExampleServiceState.class)) + .build()) + .setCompletion(authCtx.getCompletion()) + .start(); + authCtx.await(); + + // create a sample service + ExampleServiceState doc = new ExampleServiceState(); + doc.name = "foo"; + doc.documentSelfLink = "foo"; + + Operation post = Operation.createPost(host, ExampleService.FACTORY_LINK).setBody(doc); + ExampleServiceState postResult = sender.sendAndWait(post, ExampleServiceState.class); + + host.resetAuthorizationContext(); + + URI factoryAvailableUri = UriUtils.buildAvailableUri(host, ExampleService.FACTORY_LINK); + URI factoryStatsUri = UriUtils.buildStatsUri(host, ExampleService.FACTORY_LINK); + URI factoryConfigUri = UriUtils.buildConfigUri(host, ExampleService.FACTORY_LINK); + URI factorySubscriptionUri = UriUtils.buildSubscriptionUri(host, ExampleService.FACTORY_LINK); + URI factoryTemplateUri = UriUtils.buildUri(host, UriUtils.buildUriPath(ExampleService.FACTORY_LINK, SERVICE_URI_SUFFIX_TEMPLATE)); + URI factoryUiUri = UriUtils.buildUri(host, UriUtils.buildUriPath(ExampleService.FACTORY_LINK, SERVICE_URI_SUFFIX_UI)); + + URI serviceAvailableUri = UriUtils.buildAvailableUri(host, postResult.documentSelfLink); + URI serviceStatsUri = UriUtils.buildStatsUri(host, postResult.documentSelfLink); + URI serviceConfigUri = UriUtils.buildConfigUri(host, postResult.documentSelfLink); + URI serviceSubscriptionUri = UriUtils.buildSubscriptionUri(host, postResult.documentSelfLink); + URI serviceTemplateUri = UriUtils.buildUri(host, UriUtils.buildUriPath(postResult.documentSelfLink, SERVICE_URI_SUFFIX_TEMPLATE)); + URI serviceUiUri = UriUtils.buildUri(host, UriUtils.buildUriPath(postResult.documentSelfLink, SERVICE_URI_SUFFIX_UI)); + + // check non-authenticated user receives forbidden response + FailureResponse failureResponse; + Operation uiOpResult; + + // check factory endpoints + failureResponse = sender.sendAndWaitFailure(Operation.createGet(factoryAvailableUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + failureResponse = sender.sendAndWaitFailure(Operation.createGet(factoryStatsUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + failureResponse = sender.sendAndWaitFailure(Operation.createGet(factoryConfigUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + failureResponse = sender.sendAndWaitFailure(Operation.createGet(factorySubscriptionUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + failureResponse = sender.sendAndWaitFailure(Operation.createGet(factoryTemplateUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + uiOpResult = sender.sendAndWait(Operation.createGet(factoryUiUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, uiOpResult.getStatusCode()); + + // check service endpoints + failureResponse = sender.sendAndWaitFailure(Operation.createGet(serviceAvailableUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + failureResponse = sender.sendAndWaitFailure(Operation.createGet(serviceStatsUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + failureResponse = sender.sendAndWaitFailure(Operation.createGet(serviceConfigUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + failureResponse = sender.sendAndWaitFailure(Operation.createGet(serviceSubscriptionUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + failureResponse = sender.sendAndWaitFailure(Operation.createGet(serviceTemplateUri)); + assertEquals(Operation.STATUS_CODE_FORBIDDEN, failureResponse.op.getStatusCode()); + + uiOpResult = sender.sendAndWait(Operation.createGet(serviceUiUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, uiOpResult.getStatusCode()); + + + // check authenticated user does NOT receive forbidden response + AuthTestUtils.login(host, exampleUser, examplePass); + + Operation response; + + // check factory endpoints + response = sender.sendAndWait(Operation.createGet(factoryAvailableUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(factoryStatsUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(factoryConfigUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(factorySubscriptionUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(factoryTemplateUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(factoryUiUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + + // check service endpoints + response = sender.sendAndWait(Operation.createGet(serviceAvailableUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(serviceStatsUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(serviceConfigUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(serviceSubscriptionUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(serviceTemplateUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + response = sender.sendAndWait(Operation.createGet(serviceUiUri)); + assertNotEquals(Operation.STATUS_CODE_FORBIDDEN, response.getStatusCode()); + + } + } diff --git a/xenon-common/src/test/java/com/vmware/xenon/common/test/AuthorizationHelper.java b/xenon-common/src/test/java/com/vmware/xenon/common/test/AuthorizationHelper.java index e847ddb36..162051d6a 100644 --- a/xenon-common/src/test/java/com/vmware/xenon/common/test/AuthorizationHelper.java +++ b/xenon-common/src/test/java/com/vmware/xenon/common/test/AuthorizationHelper.java @@ -30,6 +30,7 @@ import com.vmware.xenon.common.ServiceHost; import com.vmware.xenon.common.UriUtils; import com.vmware.xenon.common.Utils; +import com.vmware.xenon.services.common.ExampleService; import com.vmware.xenon.services.common.ExampleService.ExampleServiceState; import com.vmware.xenon.services.common.QueryTask; import com.vmware.xenon.services.common.QueryTask.Query; @@ -247,6 +248,22 @@ public String getUserGroupName(String email) { UriUtils.buildUriPath(ServiceUriPaths.CORE_AUTHZ_USERS, email)) .build()); + // Create resource group to allow access on utility paths + String statsResourceGroupLink = createResourceGroup(target, "stats-resource-group", + Builder.create() + .addFieldClause( + ServiceDocument.FIELD_NAME_SELF_LINK, + ExampleService.FACTORY_LINK + ServiceHost.SERVICE_URI_SUFFIX_STATS) + .build()); + + String subscriptionsResourceGroupLink = createResourceGroup(target, "subs-resource-group", + Builder.create() + .addFieldClause( + ServiceDocument.FIELD_NAME_SELF_LINK, + ServiceUriPaths.CORE_LOCAL_QUERY_TASKS + + ServiceHost.SERVICE_URI_SUFFIX_SUBSCRIPTIONS) + .build()); + Collection<String> paths = new HashSet<>(); // Create roles tying these together @@ -261,6 +278,16 @@ public String getUserGroupName(String email) { // Create role authorizing access to the user's own query tasks paths.add(createRole(target, userGroupLink, queryTaskResourceGroupLink, new HashSet<>(Arrays.asList(Action.GET, Action.POST, Action.PATCH, Action.DELETE)))); + + // Create role authorizing access to /stats + paths.add(createRole(target, userGroupLink, statsResourceGroupLink, + new HashSet<>( + Arrays.asList(Action.GET, Action.POST, Action.PATCH, Action.DELETE)))); + + // Create role authorizing access to /subscriptions of query tasks + paths.add(createRole(target, userGroupLink, subscriptionsResourceGroupLink, + new HashSet<>( + Arrays.asList(Action.GET, Action.POST, Action.PATCH, Action.DELETE)))); return paths; } diff --git a/xenon-common/src/test/java/com/vmware/xenon/common/test/VerificationHost.java b/xenon-common/src/test/java/com/vmware/xenon/common/test/VerificationHost.java index 0cb27957c..911756552 100644 --- a/xenon-common/src/test/java/com/vmware/xenon/common/test/VerificationHost.java +++ b/xenon-common/src/test/java/com/vmware/xenon/common/test/VerificationHost.java @@ -83,6 +83,7 @@ import com.vmware.xenon.common.Operation; import com.vmware.xenon.common.Operation.AuthorizationContext; import com.vmware.xenon.common.Operation.CompletionHandler; +import com.vmware.xenon.common.OperationContext; import com.vmware.xenon.common.Service; import com.vmware.xenon.common.Service.Action; import com.vmware.xenon.common.Service.ServiceOption; @@ -1052,7 +1053,15 @@ public ServiceDocumentQueryResult getExpandedFactoryState(URI factoryUri) { } public Map<String, ServiceStat> getServiceStats(URI serviceUri) { + AuthorizationContext ctx = null; + if (this.isAuthorizationEnabled()) { + ctx = OperationContext.getAuthorizationContext(); + this.setSystemAuthorizationContext(); + } ServiceStats stats = this.sender.sendStatsGetAndWait(serviceUri); + if (this.isAuthorizationEnabled()) { + this.setAuthorizationContext(ctx); + } return stats.entries; } diff --git a/xenon-common/src/test/java/com/vmware/xenon/services/common/TestNodeGroupService.java b/xenon-common/src/test/java/com/vmware/xenon/services/common/TestNodeGroupService.java index 9045b5f11..d042f79cc 100644 --- a/xenon-common/src/test/java/com/vmware/xenon/services/common/TestNodeGroupService.java +++ b/xenon-common/src/test/java/com/vmware/xenon/services/common/TestNodeGroupService.java @@ -3023,6 +3023,7 @@ public void replicationWithAuthzCacheClear() throws Throwable { VerificationHost groupHost = this.host.getPeerHost(); + groupHost.setSystemAuthorizationContext(); // wait for auth related services to be stabilized groupHost.waitForReplicatedFactoryServiceAvailable( UriUtils.buildUri(groupHost, UserService.FACTORY_LINK)); @@ -3040,7 +3041,7 @@ public void replicationWithAuthzCacheClear() throws Throwable { String bazUserLink = UriUtils.buildUriPath(ServiceUriPaths.CORE_AUTHZ_USERS, "[email protected]"); - groupHost.setSystemAuthorizationContext(); + // create user, user-group, resource-group, role for [email protected] // user: /core/authz/users/[email protected] @@ -3251,7 +3252,7 @@ private void populateAuthCacheInAllPeers(AuthorizationContext authContext) throw // based on the role created in test, all users have access to ExampleService this.host.sendAndWaitExpectSuccess( - Operation.createGet(UriUtils.buildStatsUri(peer, ExampleService.FACTORY_LINK))); + Operation.createGet(UriUtils.buildUri(peer, ExampleService.FACTORY_LINK))); } this.host.waitFor("Timeout waiting for correct auth cache state",
1
678a9db9c5195f3c6f2c74934b45b4cb1b4e4597
https://github.com/akrennmair/newsbeuter/commit/678a9db9c5195f3c6f2c74934b45b4cb1b4e4597
TTRSS-API: only set auth_info for "Single" ttrss-mode Currently, newsbeuter sets the HTTP-Auth parameter for all requests that target the TTRSS-api from the "ttrss-login" and "ttrss-password" config file options. This explicitly provided auth_info takes precedence over optionally provided user-information in libcurl. Therefore the following config settings urls-source "ttrss" ttrss-url "https://htuser:[email protected]" ttrss-login "ttrssuser" ttrss-password "ttrsspasswd" will try to query "trssinstance.example.org" with auth_info "ttrssuser:ttrsspasswd" and consequently fail, while libcurl as such would happily accept the auth info from "ttrss-url" when no explicit auth-info was provided. This commit rectifies this and consequently allows newsbeuter to use multiuser-TTRSS instances which are hosted behind http-basic auth.
diff --git a/doc/newsbeuter.txt b/doc/newsbeuter.txt index 53178c99..8107df0d 100644 --- a/doc/newsbeuter.txt +++ b/doc/newsbeuter.txt @@ -669,6 +669,14 @@ authentication is done against Tiny Tiny RSS itself. ttrss-mode "single" # "multi" is default +If Tiny Tiny RSS is configured in multi-user mode and still deployed behind +an additional HTTP-BasicAuth, the required username and password (which may +deviate from ttrss-login and ttrss-password) can be specified in the user-part +of the url like this: + + ttrss-url "http://htuser:[email protected]/ttrss/" + + With these settings, newsbeuter should be able to connect to Tiny Tiny RSS and download your subscribed feeds. Articles or even complete feeds that you marked as read are synchronized directly to Tiny Tiny RSS. diff --git a/src/ttrss_api.cpp b/src/ttrss_api.cpp index d63b70f0..55c0e359 100644 --- a/src/ttrss_api.cpp +++ b/src/ttrss_api.cpp @@ -12,7 +12,11 @@ namespace newsbeuter { ttrss_api::ttrss_api(configcontainer * c) : remote_api(c) { single = (cfg->get_configvalue("ttrss-mode") == "single"); - auth_info = strprintf::fmt("%s:%s", cfg->get_configvalue("ttrss-login"), cfg->get_configvalue("ttrss-password")); + if (single) { + auth_info = strprintf::fmt("%s:%s", cfg->get_configvalue("ttrss-login"), cfg->get_configvalue("ttrss-password")); + } else { + auth_info = ""; + } sid = ""; } @@ -42,7 +46,11 @@ std::string ttrss_api::retrieve_sid() { args["user"] = single ? "admin" : cred.user.c_str(); args["password"] = cred.pass.c_str(); - auth_info = strprintf::fmt("%s:%s", cred.user, cred.pass); + if (single) { + auth_info = strprintf::fmt("%s:%s", cred.user, cred.pass); + } else { + auth_info = ""; + } json_object * content = run_op("login", args); if (content == nullptr)
0
c48464c3b246e6ef0d4cd0dbf67e83ccd532c6d3
https://github.com/droolsjbpm/drools/commit/c48464c3b246e6ef0d4cd0dbf67e83ccd532c6d3
BZ-1169553 - (CVE-2014-8125) EMBARGOED CVE-2014-8125 jBPM: BPMN2 file processing XXE in Process Execution
diff --git a/drools-core/src/main/java/org/drools/core/xml/ExtensibleXmlParser.java b/drools-core/src/main/java/org/drools/core/xml/ExtensibleXmlParser.java index 6d270c46582..03c4b600204 100644 --- a/drools-core/src/main/java/org/drools/core/xml/ExtensibleXmlParser.java +++ b/drools-core/src/main/java/org/drools/core/xml/ExtensibleXmlParser.java @@ -223,7 +223,15 @@ public Object read(final InputSource in) throws SAXException, throw new RuntimeException( "Unable to create new DOM Document", e ); } - + // XXE protection start + try { + f.setFeature("http://xml.org/sax/features/external-general-entities", false); + f.setFeature("http://xml.org/sax/features/external-parameter-entities", false); + + } catch (ParserConfigurationException e) { + logger.warn("Unable to set parser features due to {}", e.getMessage()); + } + // XXE protection end try { this.document = f.newDocumentBuilder().newDocument(); } catch ( Exception e ) { @@ -254,6 +262,15 @@ public Object read(final InputSource in) throws SAXException, } factory.setNamespaceAware( true ); + // XXE protection start + try { + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); + + } catch (ParserConfigurationException e) { + logger.warn("Unable to set parser features due to {}", e.getMessage()); + } + // XXE protection end final String isValidatingString = System.getProperty( "drools.schema.validating" ); if ( System.getProperty( "drools.schema.validating" ) != null ) {
1
2f5ecbcf9ed7a3a4fd37b5c55860ad8eace1bea
https://github.com/apache/lucene-solr/commit/2f5ecbcf9ed7a3a4fd37b5c55860ad8eace1bea
added extra check if it is a liveNode (cherry picked from commit e912b7c) (cherry picked from commit 9f91c61)
diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java index 16101fc317ff..a9319aeeb6a1 100644 --- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java @@ -200,6 +200,7 @@ private static PKIHeaderData parseCipher(String cipher, PublicKey key) { } PublicKey getRemotePublicKey(String nodename) { + if (!cores.getZkController().getZkStateReader().getClusterState().getLiveNodes().contains(nodename)) return null; String url = cores.getZkController().getZkStateReader().getBaseUrlForNodeName(nodename); try { String uri = url + PATH + "?wt=json&omitHeader=true";
1
d46c06b32c9ce291b8cacad8373a33fa17a10946
https://github.com/toastdriven/django-tastypie/commit/d46c06b32c9ce291b8cacad8373a33fa17a10946
Fix CI badge to only care about master branch
diff --git a/README.rst b/README.rst index 096e5d6d..98f7e7fc 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ django-tastypie :target: https://django-tastypie.readthedocs.io/ :alt: Docs -.. image:: https://travis-ci.org/django-tastypie/django-tastypie.svg +.. image:: https://travis-ci.org/django-tastypie/django-tastypie.svg?branch=master :target: https://travis-ci.org/django-tastypie/django-tastypie :alt: CI
0
b7f2a61e77e79fd33dd75399e7923ecb9c006f17
https://github.com/status-im/react-native-desktop/commit/b7f2a61e77e79fd33dd75399e7923ecb9c006f17
Tests refactoring
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c45a7e6d..98b68c3a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ message(STATUS "External modules dirs: ${EXTERNAL_MODULES_DIR}") foreach(module_directory ${EXTERNAL_MODULES_DIR}) message(STATUS "Add external module subdirectory: ${module_directory}") add_subdirectory(${module_directory}) -endforeach(loop_var) +endforeach(module_directory) add_subdirectory(ReactQt) add_subdirectory(Examples) diff --git a/ReactQt/tests/CMakeLists.txt b/ReactQt/tests/CMakeLists.txt index aa43a1662..cac389c32 100644 --- a/ReactQt/tests/CMakeLists.txt +++ b/ReactQt/tests/CMakeLists.txt @@ -6,6 +6,8 @@ # LICENSE file in the root directory of this source tree. An additional grant # of patent rights can be found in the PATENTS file in the same directory. +project(tests) + set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) @@ -15,25 +17,12 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") find_package(Qt5Test REQUIRED) find_package(Qt5Quick REQUIRED) -set(REACT_TESTCASE_JS - JS/TestImageProps.js - JS/TestActivityIndicatorProps.js - JS/TestButtonProps.js - JS/TestSliderProps.js - JS/TestButtonSize.js - JS/TestModalProps.js - JS/TestTextInputProps.js - JS/TestPickerProps.js - JS/TestTextInputClear.js - JS/TestArrayReconciliationInsertFirst.js - JS/TestArrayReconciliationDeleteLast.js - JS/TestArrayReconciliationItemMove.js -) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common) set( - REACT_TESTCASE_SRC - reacttestcase.cpp - reactpropertytestcase.cpp + REACT_TEST_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/common/reacttestcase.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/common/reactpropertytestcase.cpp ) set( @@ -41,48 +30,24 @@ set( Qt5::Test Qt5::Quick react-native ) +add_subdirectory(test-image-props) +add_subdirectory(test-activityindicator-props) +add_subdirectory(test-button-props) +add_subdirectory(test-array-reconciliation) +add_subdirectory(test-button-size) +add_subdirectory(test-modal-props) +add_subdirectory(test-netexecutor-socket) +add_subdirectory(test-picker-props) +add_subdirectory(test-slider-props) +add_subdirectory(test-textinput-clear) +add_subdirectory(test-textinput-props ) -add_executable(test-integration test-integration.cpp resources.qrc ${REACT_TESTCASE_SRC}) -add_executable(test-image-props test-image-props.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-slider-props test-slider-props.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-activityindicator-props test-activityindicator-props.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-button-props test-button-props.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-button-size test-button-size.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-modal-props test-modal-props.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-textinput-props test-textinput-props.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-picker-props test-picker-props.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-netexecutor-socket test-netexecutor-socket.cpp ${REACT_TESTCASE_SRC}) -add_executable(test-textinput-clear test-textinput-clear.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) -add_executable(test-array-reconciliation test-array-reconciliation.cpp resources.qrc ${REACT_TESTCASE_SRC} ${REACT_TESTCASE_JS}) +#add_executable(test-integration test-integration.cpp resources.qrc ${REACT_TESTCASE_SRC}) #add_test(test-integration test-integration) -add_test(test-image-props test-image-props) -add_test(test-slider-props test-slider-props) -add_test(test-activityindicator-props test-activityindicator-props) -add_test(test-button-props test-button-props) -add_test(test-button-size test-button-size) -add_test(test-modal-props test-modal-props) -add_test(test-textinput-props test-textinput-props) -add_test(test-picker-props test-picker-props) -add_test(test-netexecutor-socket test-netexecutor-socket) -add_test(test-textinput-clear test-textinput-clear) -add_test(test-array-reconciliation test-array-reconciliation) - -target_link_libraries(test-integration ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-image-props ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-slider-props ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-activityindicator-props ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-button-props ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-button-size ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-modal-props ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-textinput-props ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-picker-props ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-netexecutor-socket ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-textinput-clear ${REACT_TESTCASE_LIBRARIES}) -target_link_libraries(test-array-reconciliation ${REACT_TESTCASE_LIBRARIES}) - -set_target_properties( - test-integration - PROPERTIES LIBRARY_OUTPUT_DIRECTORY tests -) +#target_link_libraries(test-integration ${REACT_TESTCASE_LIBRARIES}) +#set_target_properties( +# test-integration +# PROPERTIES LIBRARY_OUTPUT_DIRECTORY tests +#) diff --git a/ReactQt/tests/reactpropertytestcase.cpp b/ReactQt/tests/common/reactpropertytestcase.cpp similarity index 100% rename from ReactQt/tests/reactpropertytestcase.cpp rename to ReactQt/tests/common/reactpropertytestcase.cpp diff --git a/ReactQt/tests/reactpropertytestcase.h b/ReactQt/tests/common/reactpropertytestcase.h similarity index 100% rename from ReactQt/tests/reactpropertytestcase.h rename to ReactQt/tests/common/reactpropertytestcase.h diff --git a/ReactQt/tests/reacttestcase.cpp b/ReactQt/tests/common/reacttestcase.cpp similarity index 100% rename from ReactQt/tests/reacttestcase.cpp rename to ReactQt/tests/common/reacttestcase.cpp diff --git a/ReactQt/tests/reacttestcase.h b/ReactQt/tests/common/reacttestcase.h similarity index 100% rename from ReactQt/tests/reacttestcase.h rename to ReactQt/tests/common/reacttestcase.h diff --git a/ReactQt/tests/resources.qrc b/ReactQt/tests/resources.qrc index e8a81c739..966d67452 100644 --- a/ReactQt/tests/resources.qrc +++ b/ReactQt/tests/resources.qrc @@ -1,8 +1,6 @@ <RCC> <qresource prefix="/"> <file>TestModuleTest.qml</file> - <file>TestImageProps.qml</file> - <file>TestActivityIndicatorProps.qml</file> <file>TestButtonProps.qml</file> <file>TestSliderProps.qml</file> <file>TestButtonSize.qml</file> diff --git a/ReactQt/tests/test-activityindicator-props/CMakeLists.txt b/ReactQt/tests/test-activityindicator-props/CMakeLists.txt new file mode 100644 index 000000000..3a18932e3 --- /dev/null +++ b/ReactQt/tests/test-activityindicator-props/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-activityindicator-props) + +set(REACT_TESTCASE_JS + TestActivityIndicatorProps.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestActivityIndicatorProps.js b/ReactQt/tests/test-activityindicator-props/TestActivityIndicatorProps.js similarity index 100% rename from ReactQt/tests/JS/TestActivityIndicatorProps.js rename to ReactQt/tests/test-activityindicator-props/TestActivityIndicatorProps.js diff --git a/ReactQt/tests/TestActivityIndicatorProps.qml b/ReactQt/tests/test-activityindicator-props/TestActivityIndicatorProps.qml similarity index 79% rename from ReactQt/tests/TestActivityIndicatorProps.qml rename to ReactQt/tests/test-activityindicator-props/TestActivityIndicatorProps.qml index 2b4155d72..b5d5c585b 100644 --- a/ReactQt/tests/TestActivityIndicatorProps.qml +++ b/ReactQt/tests/test-activityindicator-props/TestActivityIndicatorProps.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestActivityIndicatorProps" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestActivityIndicatorProps.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-activityindicator-props/TestActivityIndicatorProps.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-activityindicator-props/resources.qrc b/ReactQt/tests/test-activityindicator-props/resources.qrc new file mode 100644 index 000000000..4d2115f7d --- /dev/null +++ b/ReactQt/tests/test-activityindicator-props/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestActivityIndicatorProps.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-activityindicator-props.cpp b/ReactQt/tests/test-activityindicator-props/test-activityindicator-props.cpp similarity index 100% rename from ReactQt/tests/test-activityindicator-props.cpp rename to ReactQt/tests/test-activityindicator-props/test-activityindicator-props.cpp diff --git a/ReactQt/tests/test-array-reconciliation/CMakeLists.txt b/ReactQt/tests/test-array-reconciliation/CMakeLists.txt new file mode 100644 index 000000000..963292a21 --- /dev/null +++ b/ReactQt/tests/test-array-reconciliation/CMakeLists.txt @@ -0,0 +1,21 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-array-reconciliation) + +set(REACT_TESTCASE_JS + TestArrayReconciliationDeleteLast.js + TestArrayReconciliationInsertFirst.js + TestArrayReconciliationItemMove.js + +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/TestArrayReconciliation.qml b/ReactQt/tests/test-array-reconciliation/TestArrayReconciliation.qml similarity index 78% rename from ReactQt/tests/TestArrayReconciliation.qml rename to ReactQt/tests/test-array-reconciliation/TestArrayReconciliation.qml index c413956f6..046970c07 100644 --- a/ReactQt/tests/TestArrayReconciliation.qml +++ b/ReactQt/tests/test-array-reconciliation/TestArrayReconciliation.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestArrayReconciliationInsertFirst" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestArrayReconciliationInsertFirst.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-array-reconciliation/TestArrayReconciliationInsertFirst.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/JS/TestArrayReconciliationDeleteLast.js b/ReactQt/tests/test-array-reconciliation/TestArrayReconciliationDeleteLast.js similarity index 100% rename from ReactQt/tests/JS/TestArrayReconciliationDeleteLast.js rename to ReactQt/tests/test-array-reconciliation/TestArrayReconciliationDeleteLast.js diff --git a/ReactQt/tests/JS/TestArrayReconciliationInsertFirst.js b/ReactQt/tests/test-array-reconciliation/TestArrayReconciliationInsertFirst.js similarity index 100% rename from ReactQt/tests/JS/TestArrayReconciliationInsertFirst.js rename to ReactQt/tests/test-array-reconciliation/TestArrayReconciliationInsertFirst.js diff --git a/ReactQt/tests/JS/TestArrayReconciliationItemMove.js b/ReactQt/tests/test-array-reconciliation/TestArrayReconciliationItemMove.js similarity index 100% rename from ReactQt/tests/JS/TestArrayReconciliationItemMove.js rename to ReactQt/tests/test-array-reconciliation/TestArrayReconciliationItemMove.js diff --git a/ReactQt/tests/test-array-reconciliation/resources.qrc b/ReactQt/tests/test-array-reconciliation/resources.qrc new file mode 100644 index 000000000..8bd5af278 --- /dev/null +++ b/ReactQt/tests/test-array-reconciliation/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestArrayReconciliation.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-array-reconciliation.cpp b/ReactQt/tests/test-array-reconciliation/test-array-reconciliation.cpp similarity index 96% rename from ReactQt/tests/test-array-reconciliation.cpp rename to ReactQt/tests/test-array-reconciliation/test-array-reconciliation.cpp index 6523a0d84..2195022e6 100644 --- a/ReactQt/tests/test-array-reconciliation.cpp +++ b/ReactQt/tests/test-array-reconciliation/test-array-reconciliation.cpp @@ -88,7 +88,8 @@ void TestArrayReconciliation::testComponentsArrayFirstElementInsert() { } void TestArrayReconciliation::testComponentsArrayLastElementDelete() { - loadJSBundle("TestArrayReconciliationDeleteLast", "ReactQt/tests/JS/TestArrayReconciliationDeleteLast"); + loadJSBundle("TestArrayReconciliationDeleteLast", + "ReactQt/tests/test-array-reconciliation/TestArrayReconciliationDeleteLast"); waitAndVerifyJsAppStarted(); showView(); @@ -133,7 +134,8 @@ void TestArrayReconciliation::testComponentsArrayLastElementDelete() { void TestArrayReconciliation::testComponentsArrayItemMove() { const int ARRAY_ITEMS_COUNT = 4 + 1; - loadJSBundle("TestArrayReconciliationItemMove", "ReactQt/tests/JS/TestArrayReconciliationItemMove"); + loadJSBundle("TestArrayReconciliationItemMove", + "ReactQt/tests/test-array-reconciliation/TestArrayReconciliationItemMove"); waitAndVerifyJsAppStarted(); showView(); diff --git a/ReactQt/tests/test-button-props/CMakeLists.txt b/ReactQt/tests/test-button-props/CMakeLists.txt new file mode 100644 index 000000000..e9853fc85 --- /dev/null +++ b/ReactQt/tests/test-button-props/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-button-props) + +set(REACT_TESTCASE_JS + TestButtonProps.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestButtonProps.js b/ReactQt/tests/test-button-props/TestButtonProps.js similarity index 100% rename from ReactQt/tests/JS/TestButtonProps.js rename to ReactQt/tests/test-button-props/TestButtonProps.js diff --git a/ReactQt/tests/TestButtonProps.qml b/ReactQt/tests/test-button-props/TestButtonProps.qml similarity index 81% rename from ReactQt/tests/TestButtonProps.qml rename to ReactQt/tests/test-button-props/TestButtonProps.qml index ef6354d02..c05d8d8bf 100644 --- a/ReactQt/tests/TestButtonProps.qml +++ b/ReactQt/tests/test-button-props/TestButtonProps.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestButtonProps" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestButtonProps.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-button-props/TestButtonProps.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-button-props/resources.qrc b/ReactQt/tests/test-button-props/resources.qrc new file mode 100644 index 000000000..90711b2e9 --- /dev/null +++ b/ReactQt/tests/test-button-props/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestButtonProps.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-button-props.cpp b/ReactQt/tests/test-button-props/test-button-props.cpp similarity index 100% rename from ReactQt/tests/test-button-props.cpp rename to ReactQt/tests/test-button-props/test-button-props.cpp diff --git a/ReactQt/tests/test-button-size/CMakeLists.txt b/ReactQt/tests/test-button-size/CMakeLists.txt new file mode 100644 index 000000000..f9252b4f4 --- /dev/null +++ b/ReactQt/tests/test-button-size/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-button-size) + +set(REACT_TESTCASE_JS + TestButtonSize.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestButtonSize.js b/ReactQt/tests/test-button-size/TestButtonSize.js similarity index 100% rename from ReactQt/tests/JS/TestButtonSize.js rename to ReactQt/tests/test-button-size/TestButtonSize.js diff --git a/ReactQt/tests/TestButtonSize.qml b/ReactQt/tests/test-button-size/TestButtonSize.qml similarity index 81% rename from ReactQt/tests/TestButtonSize.qml rename to ReactQt/tests/test-button-size/TestButtonSize.qml index af66a8fcb..ea82eff1e 100644 --- a/ReactQt/tests/TestButtonSize.qml +++ b/ReactQt/tests/test-button-size/TestButtonSize.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestButtonSize" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestButtonSize.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-button-size/TestButtonSize.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-button-size/resources.qrc b/ReactQt/tests/test-button-size/resources.qrc new file mode 100644 index 000000000..cd4da0c5c --- /dev/null +++ b/ReactQt/tests/test-button-size/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestButtonSize.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-button-size.cpp b/ReactQt/tests/test-button-size/test-button-size.cpp similarity index 100% rename from ReactQt/tests/test-button-size.cpp rename to ReactQt/tests/test-button-size/test-button-size.cpp diff --git a/ReactQt/tests/test-image-props/CMakeLists.txt b/ReactQt/tests/test-image-props/CMakeLists.txt new file mode 100644 index 000000000..36f620f9b --- /dev/null +++ b/ReactQt/tests/test-image-props/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-image-props) + +set(REACT_TESTCASE_JS + TestImageProps.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestImageProps.js b/ReactQt/tests/test-image-props/TestImageProps.js similarity index 100% rename from ReactQt/tests/JS/TestImageProps.js rename to ReactQt/tests/test-image-props/TestImageProps.js diff --git a/ReactQt/tests/TestImageProps.qml b/ReactQt/tests/test-image-props/TestImageProps.qml similarity index 81% rename from ReactQt/tests/TestImageProps.qml rename to ReactQt/tests/test-image-props/TestImageProps.qml index c7eb05e4c..e73f88fe9 100644 --- a/ReactQt/tests/TestImageProps.qml +++ b/ReactQt/tests/test-image-props/TestImageProps.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestImageProps" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestImageProps.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-image-props/TestImageProps.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-image-props/resources.qrc b/ReactQt/tests/test-image-props/resources.qrc new file mode 100644 index 000000000..7c0430960 --- /dev/null +++ b/ReactQt/tests/test-image-props/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestImageProps.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-image-props.cpp b/ReactQt/tests/test-image-props/test-image-props.cpp similarity index 100% rename from ReactQt/tests/test-image-props.cpp rename to ReactQt/tests/test-image-props/test-image-props.cpp diff --git a/ReactQt/tests/TestModuleTest.qml b/ReactQt/tests/test-integration/TestModuleTest.qml similarity index 100% rename from ReactQt/tests/TestModuleTest.qml rename to ReactQt/tests/test-integration/TestModuleTest.qml diff --git a/ReactQt/tests/test-integration.cpp b/ReactQt/tests/test-integration/test-integration.cpp similarity index 100% rename from ReactQt/tests/test-integration.cpp rename to ReactQt/tests/test-integration/test-integration.cpp diff --git a/ReactQt/tests/test-modal-props/CMakeLists.txt b/ReactQt/tests/test-modal-props/CMakeLists.txt new file mode 100644 index 000000000..64753c609 --- /dev/null +++ b/ReactQt/tests/test-modal-props/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-modal-props) + +set(REACT_TESTCASE_JS + TestModalProps.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestModalProps.js b/ReactQt/tests/test-modal-props/TestModalProps.js similarity index 100% rename from ReactQt/tests/JS/TestModalProps.js rename to ReactQt/tests/test-modal-props/TestModalProps.js diff --git a/ReactQt/tests/TestModalProps.qml b/ReactQt/tests/test-modal-props/TestModalProps.qml similarity index 81% rename from ReactQt/tests/TestModalProps.qml rename to ReactQt/tests/test-modal-props/TestModalProps.qml index b97f20ce7..a2cd800dd 100644 --- a/ReactQt/tests/TestModalProps.qml +++ b/ReactQt/tests/test-modal-props/TestModalProps.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestModalProps" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestModalProps.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-modal-props/TestModalProps.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-modal-props/resources.qrc b/ReactQt/tests/test-modal-props/resources.qrc new file mode 100644 index 000000000..b7eb62ba1 --- /dev/null +++ b/ReactQt/tests/test-modal-props/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestModalProps.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-modal-props.cpp b/ReactQt/tests/test-modal-props/test-modal-props.cpp similarity index 100% rename from ReactQt/tests/test-modal-props.cpp rename to ReactQt/tests/test-modal-props/test-modal-props.cpp diff --git a/ReactQt/tests/test-netexecutor-socket/CMakeLists.txt b/ReactQt/tests/test-netexecutor-socket/CMakeLists.txt new file mode 100644 index 000000000..65ff1c078 --- /dev/null +++ b/ReactQt/tests/test-netexecutor-socket/CMakeLists.txt @@ -0,0 +1,14 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-netexecutor-socket) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp ${REACT_TEST_SOURCES}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/test-netexecutor-socket.cpp b/ReactQt/tests/test-netexecutor-socket/test-netexecutor-socket.cpp similarity index 100% rename from ReactQt/tests/test-netexecutor-socket.cpp rename to ReactQt/tests/test-netexecutor-socket/test-netexecutor-socket.cpp diff --git a/ReactQt/tests/test-picker-props/CMakeLists.txt b/ReactQt/tests/test-picker-props/CMakeLists.txt new file mode 100644 index 000000000..1f5943099 --- /dev/null +++ b/ReactQt/tests/test-picker-props/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-picker-props) + +set(REACT_TESTCASE_JS + TestPickerProps.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestPickerProps.js b/ReactQt/tests/test-picker-props/TestPickerProps.js similarity index 100% rename from ReactQt/tests/JS/TestPickerProps.js rename to ReactQt/tests/test-picker-props/TestPickerProps.js diff --git a/ReactQt/tests/TestPickerProps.qml b/ReactQt/tests/test-picker-props/TestPickerProps.qml similarity index 81% rename from ReactQt/tests/TestPickerProps.qml rename to ReactQt/tests/test-picker-props/TestPickerProps.qml index 2c58b21fd..4287ea067 100644 --- a/ReactQt/tests/TestPickerProps.qml +++ b/ReactQt/tests/test-picker-props/TestPickerProps.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestPickerProps" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestPickerProps.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-picker-props/TestPickerProps.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-picker-props/resources.qrc b/ReactQt/tests/test-picker-props/resources.qrc new file mode 100644 index 000000000..455657523 --- /dev/null +++ b/ReactQt/tests/test-picker-props/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestPickerProps.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-picker-props.cpp b/ReactQt/tests/test-picker-props/test-picker-props.cpp similarity index 100% rename from ReactQt/tests/test-picker-props.cpp rename to ReactQt/tests/test-picker-props/test-picker-props.cpp diff --git a/ReactQt/tests/test-slider-props/CMakeLists.txt b/ReactQt/tests/test-slider-props/CMakeLists.txt new file mode 100644 index 000000000..8be21ce58 --- /dev/null +++ b/ReactQt/tests/test-slider-props/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-slider-props) + +set(REACT_TESTCASE_JS + TestSliderProps.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestSliderProps.js b/ReactQt/tests/test-slider-props/TestSliderProps.js similarity index 100% rename from ReactQt/tests/JS/TestSliderProps.js rename to ReactQt/tests/test-slider-props/TestSliderProps.js diff --git a/ReactQt/tests/TestSliderProps.qml b/ReactQt/tests/test-slider-props/TestSliderProps.qml similarity index 81% rename from ReactQt/tests/TestSliderProps.qml rename to ReactQt/tests/test-slider-props/TestSliderProps.qml index 0641aa7a1..8830c43ba 100644 --- a/ReactQt/tests/TestSliderProps.qml +++ b/ReactQt/tests/test-slider-props/TestSliderProps.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestSliderProps" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestSliderProps.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-slider-props/TestSliderProps.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-slider-props/resources.qrc b/ReactQt/tests/test-slider-props/resources.qrc new file mode 100644 index 000000000..12bc590bf --- /dev/null +++ b/ReactQt/tests/test-slider-props/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestSliderProps.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-slider-props.cpp b/ReactQt/tests/test-slider-props/test-slider-props.cpp similarity index 100% rename from ReactQt/tests/test-slider-props.cpp rename to ReactQt/tests/test-slider-props/test-slider-props.cpp diff --git a/ReactQt/tests/test-textinput-clear/CMakeLists.txt b/ReactQt/tests/test-textinput-clear/CMakeLists.txt new file mode 100644 index 000000000..b30038203 --- /dev/null +++ b/ReactQt/tests/test-textinput-clear/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-textinput-clear) + +set(REACT_TESTCASE_JS + TestTextInputClear.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestTextInputClear.js b/ReactQt/tests/test-textinput-clear/TestTextInputClear.js similarity index 100% rename from ReactQt/tests/JS/TestTextInputClear.js rename to ReactQt/tests/test-textinput-clear/TestTextInputClear.js diff --git a/ReactQt/tests/TestTextInputClear.qml b/ReactQt/tests/test-textinput-clear/TestTextInputClear.qml similarity index 80% rename from ReactQt/tests/TestTextInputClear.qml rename to ReactQt/tests/test-textinput-clear/TestTextInputClear.qml index 56621755e..22d6a1244 100644 --- a/ReactQt/tests/TestTextInputClear.qml +++ b/ReactQt/tests/test-textinput-clear/TestTextInputClear.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestTextInputClear" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestTextInputClear.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-textinput-clear/TestTextInputClear.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-textinput-clear/resources.qrc b/ReactQt/tests/test-textinput-clear/resources.qrc new file mode 100644 index 000000000..162c79ce4 --- /dev/null +++ b/ReactQt/tests/test-textinput-clear/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestTextInputClear.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-textinput-clear.cpp b/ReactQt/tests/test-textinput-clear/test-textinput-clear.cpp similarity index 100% rename from ReactQt/tests/test-textinput-clear.cpp rename to ReactQt/tests/test-textinput-clear/test-textinput-clear.cpp diff --git a/ReactQt/tests/test-textinput-props/CMakeLists.txt b/ReactQt/tests/test-textinput-props/CMakeLists.txt new file mode 100644 index 000000000..9abc0525a --- /dev/null +++ b/ReactQt/tests/test-textinput-props/CMakeLists.txt @@ -0,0 +1,18 @@ + +# Copyright (c) 2017-present, Status Research and Development GmbH. +# All rights reserved. + +# This source code is licensed under the BSD-style license found in the +# LICENSE file in the root directory of this source tree. An additional grant +# of patent rights can be found in the PATENTS file in the same directory. + +set(TEST_NAME test-textinput-props) + +set(REACT_TESTCASE_JS + TestTextInputProps.js +) + + +add_executable(${TEST_NAME} ${TEST_NAME}.cpp resources.qrc ${REACT_TEST_SOURCES} ${REACT_TESTCASE_JS}) +add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME}) +target_link_libraries(${TEST_NAME} ${REACT_TESTCASE_LIBRARIES}) diff --git a/ReactQt/tests/JS/TestTextInputProps.js b/ReactQt/tests/test-textinput-props/TestTextInputProps.js similarity index 100% rename from ReactQt/tests/JS/TestTextInputProps.js rename to ReactQt/tests/test-textinput-props/TestTextInputProps.js diff --git a/ReactQt/tests/TestTextInputProps.qml b/ReactQt/tests/test-textinput-props/TestTextInputProps.qml similarity index 80% rename from ReactQt/tests/TestTextInputProps.qml rename to ReactQt/tests/test-textinput-props/TestTextInputProps.qml index 9cc6869b4..6c6bc25ef 100644 --- a/ReactQt/tests/TestTextInputProps.qml +++ b/ReactQt/tests/test-textinput-props/TestTextInputProps.qml @@ -20,6 +20,6 @@ Rectangle { anchors.fill: parent moduleName: "TestTextInputProps" - codeLocation: "http://localhost:8081/ReactQt/tests/JS/TestTextInputProps.bundle?platform=desktop-qt&dev=true" + codeLocation: "http://localhost:8081/ReactQt/tests/test-textinput-props/TestTextInputProps.bundle?platform=desktop-qt&dev=true" } } diff --git a/ReactQt/tests/test-textinput-props/resources.qrc b/ReactQt/tests/test-textinput-props/resources.qrc new file mode 100644 index 000000000..4b92c658e --- /dev/null +++ b/ReactQt/tests/test-textinput-props/resources.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>TestTextInputProps.qml</file> + </qresource> +</RCC> diff --git a/ReactQt/tests/test-textinput-props.cpp b/ReactQt/tests/test-textinput-props/test-textinput-props.cpp similarity index 100% rename from ReactQt/tests/test-textinput-props.cpp rename to ReactQt/tests/test-textinput-props/test-textinput-props.cpp
0
f92d6a07d0d01226fb80c82608d332843c01f2d6
https://github.com/josh/rails/commit/f92d6a07d0d01226fb80c82608d332843c01f2d6
Reuse named route helper module between Routing reloads to prevent memory leaks. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5548 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 1b0f6e55b3219..dcfb88f37f79c 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Reuse named route helper module between Routing reloads. Use remove_method to delete named route methods after each load. Since the module is never collected, this fixes a significant memory leak. [Nicholas Seckar] + * ActionView::Base.erb_variable accessor names the buffer variable used to render templates. Defaults to _erbout; use _buf for erubis. [Rick Olson] * assert_select_rjs :remove. [Dylan Egan] diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 35eec734d35a2..3c53acc164bff 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -996,7 +996,11 @@ def initialize def clear! @routes = {} @helpers = [] - @module = Module.new + + @module ||= Module.new + @module.instance_methods.each do |selector| + @module.send :remove_method, selector + end end def add(name, route)
1
f663dfb8431c97d95682a2b533cca1c8233d21b4
https://github.com/ImageMagick/ImageMagick6/commit/f663dfb8431c97d95682a2b533cca1c8233d21b4
https://github.com/ImageMagick/ImageMagick/issues/1546
diff --git a/coders/xwd.c b/coders/xwd.c index 186b3f1ca2..94a2907c93 100644 --- a/coders/xwd.c +++ b/coders/xwd.c @@ -243,6 +243,9 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); if ((header.bits_per_pixel == 0) || (header.bits_per_pixel > 32)) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + if ((header.bitmap_bit_order != MSBFirst) && + (header.bitmap_bit_order != LSBFirst)) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); if (((header.bitmap_pad % 8) != 0) || (header.bitmap_pad > 32)) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); if (header.bitmap_unit > 32)
1
997074e46fb5f02819902bc638dad94a98e69514
https://github.com/voten-co/voten/commit/997074e46fb5f02819902bc638dad94a98e69514
Style code
diff --git a/app/Http/Controllers/PhotoController.php b/app/Http/Controllers/PhotoController.php index 7168534f..3aa316e6 100755 --- a/app/Http/Controllers/PhotoController.php +++ b/app/Http/Controllers/PhotoController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Channel; +use App\Http\Resources\PhotoResource; use App\Photo; use App\PhotoTools; use App\Traits\CachableChannel; @@ -11,7 +12,6 @@ use Illuminate\Support\Facades\Storage; use Illuminate\Validation\Rule; use Intervention\Image\ImageManagerStatic as Image; -use App\Http\Resources\PhotoResource; class PhotoController extends Controller { @@ -45,10 +45,10 @@ public function store(Request $request) } /** - * Get the uploaded photo. - * + * Get the uploaded photo. + * * @param integer $photo - * + * * @return PhotoResource */ public function get(Photo $photo) @@ -65,11 +65,11 @@ public function channelAvatar(Request $request, Channel $channel) { // validate $this->validate($request, [ - 'photo' => ['required', 'image', Rule::dimensions()->minWidth(250)->minHeight(250)->ratio(1 / 1)] + 'photo' => ['required', 'image', Rule::dimensions()->minWidth(250)->minHeight(250)->ratio(1 / 1)], ]); // fill variables - $filename = time().str_random(16).'.png'; + $filename = time() . str_random(16) . '.png'; $image = Image::make($request->file('photo')->getRealPath()); $folder = 'channels/avatars'; @@ -80,10 +80,10 @@ public function channelAvatar(Request $request, Channel $channel) $image->encode('png', 60); // upload it - Storage::put($folder.'/'.$filename, $image); - $imageAddress = $this->webAddress().$folder.'/'.$filename; + Storage::put($folder . '/' . $filename, $image); + $imageAddress = $this->webAddress() . $folder . '/' . $filename; - // delete the old avatar + // delete the old avatar Storage::delete('channels/avatars/' . str_after($channel->avatar, 'channels/avatars/')); // update channel's avatar @@ -104,11 +104,11 @@ public function userAvatar(Request $request) { // validate $this->validate($request, [ - 'photo' => ['required', 'image', Rule::dimensions()->minWidth(250)->minHeight(250)->ratio(1 / 1)] + 'photo' => ['required', 'image', Rule::dimensions()->minWidth(250)->minHeight(250)->ratio(1 / 1)], ]); // fill variables - $filename = time().str_random(16).'.png'; + $filename = time() . str_random(16) . '.png'; $image = Image::make($request->file('photo')->getRealPath()); $folder = 'users/avatars'; @@ -119,10 +119,10 @@ public function userAvatar(Request $request) $image->encode('png', 60); // upload it - Storage::put($folder.'/'.$filename, $image); - $imageAddress = $this->webAddress().$folder.'/'.$filename; + Storage::put($folder . '/' . $filename, $image); + $imageAddress = $this->webAddress() . $folder . '/' . $filename; - // delete the old avatar + // delete the old avatar if (isset(Auth::user()->avatar)) { Storage::delete('users/avatars/' . str_after(Auth::user()->avatar, 'users/avatars/')); }
0
6ed0077520e2b0da1fd060c7f88db7b2e6068e4c
https://github.com/TeX-Live/texlive-source/commit/6ed0077520e2b0da1fd060c7f88db7b2e6068e4c
writet1 protection against buffer overflow git-svn-id: svn://tug.org/texlive/trunk/Build/source@48697 c570f23f-e606-0410-a88d-b1316a301751
diff --git a/texk/dvipsk/ChangeLog b/texk/dvipsk/ChangeLog index 88faea4477..bbce8fb3f8 100644 --- a/texk/dvipsk/ChangeLog +++ b/texk/dvipsk/ChangeLog @@ -1,3 +1,8 @@ +2018-09-18 Nick Roessler <[email protected]> + + * writet1.c (t1_check_unusual_charstring): protect against buffer + overflow. + 2018-04-14 Karl Berry <[email protected]> * Version 5.998 for TeX Live 2018 release. diff --git a/texk/dvipsk/writet1.c b/texk/dvipsk/writet1.c index 0fcf269070..3b478b9008 100644 --- a/texk/dvipsk/writet1.c +++ b/texk/dvipsk/writet1.c @@ -1449,7 +1449,9 @@ static void t1_check_unusual_charstring(void) *(strend(t1_buf_array) - 1) = ' '; t1_getline(); + alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE); strcat(t1_buf_array, t1_line_array); + alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE); strcpy(t1_line_array, t1_buf_array); t1_line_ptr = eol(t1_line_array); } diff --git a/texk/web2c/luatexdir/ChangeLog b/texk/web2c/luatexdir/ChangeLog index 62d4ab0491..7219983d41 100644 --- a/texk/web2c/luatexdir/ChangeLog +++ b/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2018-09-18 Nick Roessler <[email protected]> + * fonts/writet1.w (t1_check_unusual_charstring): protect against + buffer overflow. + 2018-08-27 Luigi Scarso <[email protected]> * dropped dependency from gmp and mpfr diff --git a/texk/web2c/luatexdir/font/writet1.c b/texk/web2c/luatexdir/font/writet1.c index 0a0cadcfb9..d3bf29341c 100644 --- a/texk/web2c/luatexdir/font/writet1.c +++ b/texk/web2c/luatexdir/font/writet1.c @@ -1581,7 +1581,9 @@ static void t1_check_unusual_charstring(void) if (sscanf(p, "%i", &i) != 1) { strcpy(t1_buf_array, t1_line_array); t1_getline(); + alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE); strcat(t1_buf_array, t1_line_array); + alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE); strcpy(t1_line_array, t1_buf_array); t1_line_ptr = eol(t1_line_array); } diff --git a/texk/web2c/pdftexdir/ChangeLog b/texk/web2c/pdftexdir/ChangeLog index 9fbb811490..6e936a0610 100644 --- a/texk/web2c/pdftexdir/ChangeLog +++ b/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2018-09-18 Nick Roessler <[email protected]> + + * writet1.c (t1_check_unusual_charstring): protect against buffer + overflow. + 2018-09-09 Karl Berry <[email protected]> * expanded.test, diff --git a/texk/web2c/pdftexdir/writet1.c b/texk/web2c/pdftexdir/writet1.c index d191b77ee5..8cfc2616ca 100644 --- a/texk/web2c/pdftexdir/writet1.c +++ b/texk/web2c/pdftexdir/writet1.c @@ -1598,7 +1598,9 @@ static void t1_check_unusual_charstring(void) *(strend(t1_buf_array) - 1) = ' '; t1_getline(); + alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE); strcat(t1_buf_array, t1_line_array); + alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE); strcpy(t1_line_array, t1_buf_array); t1_line_ptr = eol(t1_line_array); }
1
025b48f3193e2b10b1c41d2bc3bcfc9cfc238a27
https://github.com/apache/qpid-broker-j/commit/025b48f3193e2b10b1c41d2bc3bcfc9cfc238a27
QPID-8203: [Broker-J][AMQP 0-9] Fix maximum message size check
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index e7bafd0d07..ac9ea952b8 100644 --- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -2217,7 +2217,10 @@ public void receiveMessageHeader(final BasicContentHeaderProperties properties, closeChannel(ErrorCodes.MESSAGE_TOO_LARGE, "Message size of " + bodySize + " greater than allowed maximum of " + _connection.getMaxMessageSize()); } - publishContentHeader(new ContentHeaderBody(properties, bodySize)); + else + { + publishContentHeader(new ContentHeaderBody(properties, bodySize)); + } } else { diff --git a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/maxsize/MaximumMessageSize.java b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/maxsize/MaximumMessageSize.java new file mode 100644 index 0000000000..837b6e5b4f --- /dev/null +++ b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/maxsize/MaximumMessageSize.java @@ -0,0 +1,83 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.qpid.tests.protocol.v0_8.extension.maxsize; + +import static org.apache.qpid.tests.utils.BrokerAdmin.KIND_BROKER_J; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +import java.net.InetSocketAddress; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.junit.Before; +import org.junit.Test; + +import org.apache.qpid.server.protocol.v0_8.transport.ChannelCloseBody; +import org.apache.qpid.server.protocol.v0_8.transport.ChannelOpenOkBody; +import org.apache.qpid.server.protocol.v0_8.transport.ConnectionCloseOkBody; +import org.apache.qpid.tests.protocol.ChannelClosedResponse; +import org.apache.qpid.tests.protocol.v0_8.FrameTransport; +import org.apache.qpid.tests.protocol.v0_8.Interaction; +import org.apache.qpid.tests.utils.BrokerAdmin; +import org.apache.qpid.tests.utils.BrokerAdminUsingTestBase; +import org.apache.qpid.tests.utils.BrokerSpecific; +import org.apache.qpid.tests.utils.ConfigItem; + +@BrokerSpecific(kind = KIND_BROKER_J) +@ConfigItem(name = "qpid.max_message_size", value = "1000") +public class MaximumMessageSize extends BrokerAdminUsingTestBase +{ + private InetSocketAddress _brokerAddress; + + @Before + public void setUp() + { + _brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.ANONYMOUS_AMQP); + getBrokerAdmin().createQueue(BrokerAdmin.TEST_QUEUE_NAME); + } + + @Test + public void limitExceeded() throws Exception + { + String content = Stream.generate(() -> String.valueOf('.')).limit(1001).collect(Collectors.joining()); + try(FrameTransport transport = new FrameTransport(_brokerAddress).connect()) + { + final Interaction interaction = transport.newInteraction(); + interaction.openAnonymousConnection() + .channel().open().consumeResponse(ChannelOpenOkBody.class) + .basic().contentHeaderPropertiesContentType("text/plain") + .contentHeaderPropertiesDeliveryMode((byte)1) + .contentHeaderPropertiesPriority((byte)1) + .publishExchange("") + .publishRoutingKey(BrokerAdmin.TEST_QUEUE_NAME) + .content(content) + .publishMessage() + .consumeResponse(ChannelCloseBody.class) + .channel().closeOk() + .connection().close() + .consumeResponse(ConnectionCloseOkBody.class, ChannelClosedResponse.class); + + assertThat(getBrokerAdmin().getQueueDepthMessages(BrokerAdmin.TEST_QUEUE_NAME), is(equalTo(0))); + } + } +}
1
51b0ae01709adc1e4a9245e158ef17b85a110960
https://github.com/ImageMagick/ImageMagick/commit/51b0ae01709adc1e4a9245e158ef17b85a110960
https://github.com/ImageMagick/ImageMagick/issues/362
diff --git a/coders/mat.c b/coders/mat.c index e1623a82e8..cf2190bf37 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -1123,6 +1123,7 @@ RestoreMSCWarning BImgBuff = (unsigned char *) AcquireQuantumMemory((size_t) (ldblk),sizeof(double)); /* Ldblk was set in the check phase */ if (BImgBuff == NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + (void) ResetMagickMemory(BImgBuff,0,ldblk*sizeof(double)); MinVal = 0; MaxVal = 0;
1
ffd3f762ce4a8de3b8962f33513e073c55d943b5
https://github.com/espocrm/espocrm/commit/ffd3f762ce4a8de3b8962f33513e073c55d943b5
xss fixes
diff --git a/client/res/templates/attachment/fields/name/detail.tpl b/client/res/templates/attachment/fields/name/detail.tpl index 454f6eebaf..ee4a129e43 100644 --- a/client/res/templates/attachment/fields/name/detail.tpl +++ b/client/res/templates/attachment/fields/name/detail.tpl @@ -1,2 +1,2 @@ -<span class="fas fa-paperclip small"></span> <a href="{{url}}">{{{value}}}</a> +<span class="fas fa-paperclip small"></span> <a href="{{url}}">{{value}}</a> diff --git a/client/src/view-helper.js b/client/src/view-helper.js index be2724fb64..40b31acf73 100644 --- a/client/src/view-helper.js +++ b/client/src/view-helper.js @@ -321,6 +321,77 @@ define('view-helper', ['lib!client/lib/purify.min.js'], function () { sanitizeHtml: function (text, options) { return DOMPurify.sanitize(text, options); }, + + moderateSanitizeHtml: function (value) { + value = value || ''; + value = value.replace(/<[\/]{0,1}(base)[^><]*>/gi, ''); + value = value.replace(/<[\/]{0,1}(object)[^><]*>/gi, ''); + value = value.replace(/<[\/]{0,1}(embed)[^><]*>/gi, ''); + value = value.replace(/<[\/]{0,1}(applet)[^><]*>/gi, ''); + value = value.replace(/<[\/]{0,1}(iframe)[^><]*>/gi, ''); + value = value.replace(/<[\/]{0,1}(script)[^><]*>/gi, ''); + value = value.replace(/<[^><]*([^a-z]{1}on[a-z]+)=[^><]*>/gi, function (match) { + return match.replace(/[^a-z]{1}on[a-z]+=/gi, ' data-handler-stripped='); + }); + + value = this.stripEventHandlersInHtml(value); + + value = value.replace(/href=" *javascript\:(.*?)"/gi, function(m, $1) { + return 'removed=""'; + }); + value = value.replace(/href=' *javascript\:(.*?)'/gi, function(m, $1) { + return 'removed=""'; + }); + value = value.replace(/src=" *javascript\:(.*?)"/gi, function(m, $1) { + return 'removed=""'; + }); + value = value.replace(/src=' *javascript\:(.*?)'/gi, function(m, $1) { + return 'removed=""'; + }); + + return value; + }, + + stripEventHandlersInHtml: function (html) { + function stripHTML(){ + html = html.slice(0, strip) + html.slice(j); + j = strip; + strip = false; + } + function isValidTagChar(str) { + return str.match(/[a-z?\\\/!]/i); + } + var strip = false; + var lastQuote = false; + for (var i = 0; i<html.length; i++){ + if (html[i] === "<" && html[i+1] && isValidTagChar(html[i+1])) { + i++; + for (var j = i; j<html.length; j++){ + if (!lastQuote && html[j] === ">"){ + if (strip) { + stripHTML(); + } + i = j; + break; + } + if (lastQuote === html[j]){ + lastQuote = false; + continue; + } + if (!lastQuote && html[j-1] === "=" && (html[j] === "'" || html[j] === '"')){ + lastQuote = html[j]; + } + if (!lastQuote && html[j-2] === " " && html[j-1] === "o" && html[j] === "n"){ + strip = j-2; + } + if (strip && html[j] === " " && !lastQuote){ + stripHTML(); + } + } + } + } + return html; + }, }); return ViewHelper; diff --git a/client/src/views/attachment/fields/name.js b/client/src/views/attachment/fields/name.js index 0f0cb268f4..ee012ede06 100644 --- a/client/src/views/attachment/fields/name.js +++ b/client/src/views/attachment/fields/name.js @@ -26,7 +26,7 @@ * these Appropriate Legal Notices must retain the display of tтhe "EspoCRM" word. ************************************************************************/ -Espo.define('views/attachment/fields/name', 'views/fields/varchar', function (Dep) { +define('views/attachment/fields/name', 'views/fields/varchar', function (Dep) { return Dep.extend({ diff --git a/client/src/views/fields/wysiwyg.js b/client/src/views/fields/wysiwyg.js index a7b2c02d4d..b96086eb1c 100644 --- a/client/src/views/fields/wysiwyg.js +++ b/client/src/views/fields/wysiwyg.js @@ -165,30 +165,7 @@ Espo.define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], fun sanitizeHtmlLight: function (value) { - value = value || ''; - value = value.replace(/<[\/]{0,1}(base)[^><]*>/gi, ''); - value = value.replace(/<[\/]{0,1}(object)[^><]*>/gi, ''); - value = value.replace(/<[\/]{0,1}(embed)[^><]*>/gi, ''); - value = value.replace(/<[\/]{0,1}(applet)[^><]*>/gi, ''); - value = value.replace(/<[\/]{0,1}(iframe)[^><]*>/gi, ''); - value = value.replace(/<[\/]{0,1}(script)[^><]*>/gi, ''); - value = value.replace(/<[^><]*([^a-z]{1}on[a-z]+)=[^><]*>/gi, function (match) { - return match.replace(/[^a-z]{1}on[a-z]+=/gi, ' data-handler-stripped='); - }); - - value = value.replace(/href=" *javascript\:(.*?)"/gi, function(m, $1) { - return 'removed=""'; - }); - value = value.replace(/href=' *javascript\:(.*?)'/gi, function(m, $1) { - return 'removed=""'; - }); - value = value.replace(/src=" *javascript\:(.*?)"/gi, function(m, $1) { - return 'removed=""'; - }); - value = value.replace(/src=' *javascript\:(.*?)'/gi, function(m, $1) { - return 'removed=""'; - }); - return value; + return this.getHelper().moderateSanitizeHtml(value); }, getValueForEdit: function () { diff --git a/client/src/views/preferences/fields/dashboard-tab-list.js b/client/src/views/preferences/fields/dashboard-tab-list.js index b8a855f2c7..c043154ef7 100644 --- a/client/src/views/preferences/fields/dashboard-tab-list.js +++ b/client/src/views/preferences/fields/dashboard-tab-list.js @@ -26,7 +26,7 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('views/preferences/fields/dashboard-tab-list', 'views/fields/array', function (Dep) { +define('views/preferences/fields/dashboard-tab-list', 'views/fields/array', function (Dep) { return Dep.extend({ @@ -39,17 +39,18 @@ Espo.define('views/preferences/fields/dashboard-tab-list', 'views/fields/array', this.translatedOptions[value] = value; }, this); }, - getItemHtml: function (value) { - var translatedValue = this.translatedOptions[value] || value; + value = value.toString(); + var valueSanitized = this.escapeValue(value); + var translatedValue = this.escapeValue(this.translatedOptions[value] || value); var html = '' + - '<div class="list-group-item link-with-role form-inline" data-value="' + value + '">' + + '<div class="list-group-item link-with-role form-inline" data-value="' + valueSanitized + '">' + '<div class="pull-left" style="width: 92%; display: inline-block;">' + - '<input data-name="translatedValue" data-value="' + value + '" class="role form-control input-sm" value="'+translatedValue+'">' + + '<input data-name="translatedValue" data-value="' + valueSanitized + '" class="role form-control input-sm" value="'+translatedValue+'">' + '</div>' + '<div style="width: 8%; display: inline-block; vertical-align: top;">' + - '<a href="javascript:" class="pull-right" data-value="' + value + '" data-action="removeValue"><span class="fas fa-times"></a>' + + '<a href="javascript:" class="pull-right" data-value="' + valueSanitized + '" data-action="removeValue"><span class="fas fa-times"></a>' + '</div><br style="clear: both;" />' + '</div>'; @@ -60,7 +61,8 @@ Espo.define('views/preferences/fields/dashboard-tab-list', 'views/fields/array', var data = Dep.prototype.fetch.call(this); data.translatedOptions = {}; (data[this.name] || []).forEach(function (value) { - data.translatedOptions[value] = this.$el.find('input[data-name="translatedValue"][data-value="'+value+'"]').val() || value; + var valueInternal = value.replace(/"/g, '\\"'); + data.translatedOptions[value] = this.$el.find('input[data-name="translatedValue"][data-value="'+valueInternal+'"]').val() || value; }, this); return data;
1
b029e67c216792f983e6116ad0c33a8b7b66f656
https://github.com/opnsense/core/commit/b029e67c216792f983e6116ad0c33a8b7b66f656
firmware: more annotations
diff --git a/src/etc/rc.syshook.d/early/05-update b/src/etc/rc.syshook.d/early/05-update index 0143a33ec4..0f4249dd2b 100755 --- a/src/etc/rc.syshook.d/early/05-update +++ b/src/etc/rc.syshook.d/early/05-update @@ -3,10 +3,11 @@ # Perform major updates if opnsense-update -B; then + # reroot only, we swapped the base files reboot -r fi if opnsense-update -P; then - # XXX omit eventually? + # reboot to load properly including boot screen reboot fi
0
892b55e1f6e0a3505fe22bd2d67c368f715e6296
https://github.com/droolsjbpm/kie-wb-distributions/commit/892b55e1f6e0a3505fe22bd2d67c368f715e6296
upgraded to 7.49.0-SNAPSHOT
diff --git a/business-central-parent/add-ons-distribution/pom.xml b/business-central-parent/add-ons-distribution/pom.xml index 33ea7e360e..9cdd6b2bbe 100644 --- a/business-central-parent/add-ons-distribution/pom.xml +++ b/business-central-parent/add-ons-distribution/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>business-central-parent</artifactId> <groupId>org.kie</groupId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>add-ons-distribution</artifactId> diff --git a/business-central-parent/business-central-deployment-validation/pom.xml b/business-central-parent/business-central-deployment-validation/pom.xml index ae1b9f077d..9f1c76ae33 100644 --- a/business-central-parent/business-central-deployment-validation/pom.xml +++ b/business-central-parent/business-central-deployment-validation/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-deployment-validation</artifactId> <name>Business Central Deployment Validation</name> diff --git a/business-central-parent/business-central-distribution-wars/business-central/pom.xml b/business-central-parent/business-central-distribution-wars/business-central/pom.xml index 2bb0431949..04cd9701ee 100644 --- a/business-central-parent/business-central-distribution-wars/business-central/pom.xml +++ b/business-central-parent/business-central-distribution-wars/business-central/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-distribution-wars</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central</artifactId> diff --git a/business-central-parent/business-central-distribution-wars/business-monitoring/pom.xml b/business-central-parent/business-central-distribution-wars/business-monitoring/pom.xml index df076ee4f7..cf8bd79a8f 100644 --- a/business-central-parent/business-central-distribution-wars/business-monitoring/pom.xml +++ b/business-central-parent/business-central-distribution-wars/business-monitoring/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-distribution-wars</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-monitoring</artifactId> diff --git a/business-central-parent/business-central-distribution-wars/pom.xml b/business-central-parent/business-central-distribution-wars/pom.xml index 157b00a5be..f9166db324 100644 --- a/business-central-parent/business-central-distribution-wars/pom.xml +++ b/business-central-parent/business-central-distribution-wars/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-distribution-wars</artifactId> diff --git a/business-central-parent/business-central-home-page-community/pom.xml b/business-central-parent/business-central-home-page-community/pom.xml index a6358ea6d0..2e6e482498 100644 --- a/business-central-parent/business-central-home-page-community/pom.xml +++ b/business-central-parent/business-central-home-page-community/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-home-page-community</artifactId> diff --git a/business-central-parent/business-central-home-page-product/pom.xml b/business-central-parent/business-central-home-page-product/pom.xml index 949ba1ffd2..6330c0622c 100644 --- a/business-central-parent/business-central-home-page-product/pom.xml +++ b/business-central-parent/business-central-home-page-product/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-home-page-product</artifactId> diff --git a/business-central-parent/business-central-theme/business-central-theme-community/pom.xml b/business-central-parent/business-central-theme/business-central-theme-community/pom.xml index dfcf5c41f6..1fb997bcd6 100644 --- a/business-central-parent/business-central-theme/business-central-theme-community/pom.xml +++ b/business-central-parent/business-central-theme/business-central-theme-community/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-theme</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-theme-community</artifactId> diff --git a/business-central-parent/business-central-theme/business-central-theme-product/pom.xml b/business-central-parent/business-central-theme/business-central-theme-product/pom.xml index 701a1d95ac..8fa85dc31b 100644 --- a/business-central-parent/business-central-theme/business-central-theme-product/pom.xml +++ b/business-central-parent/business-central-theme/business-central-theme-product/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-theme</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-theme-product</artifactId> diff --git a/business-central-parent/business-central-theme/pom.xml b/business-central-parent/business-central-theme/pom.xml index 380d0c71ad..602b889b25 100644 --- a/business-central-parent/business-central-theme/pom.xml +++ b/business-central-parent/business-central-theme/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-theme</artifactId> diff --git a/business-central-parent/business-central-webapp-common/pom.xml b/business-central-parent/business-central-webapp-common/pom.xml index 7e08818629..c25046710c 100644 --- a/business-central-parent/business-central-webapp-common/pom.xml +++ b/business-central-parent/business-central-webapp-common/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>business-central-parent</artifactId> <groupId>org.kie</groupId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/business-central-parent/business-central-webapp/pom.xml b/business-central-parent/business-central-webapp/pom.xml index d1c7bd2259..5dc530a130 100644 --- a/business-central-parent/business-central-webapp/pom.xml +++ b/business-central-parent/business-central-webapp/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-webapp</artifactId> diff --git a/business-central-parent/business-monitoring-webapp/pom.xml b/business-central-parent/business-monitoring-webapp/pom.xml index 9c489b7a5e..d90cd1026c 100644 --- a/business-central-parent/business-monitoring-webapp/pom.xml +++ b/business-central-parent/business-monitoring-webapp/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-monitoring-webapp</artifactId> diff --git a/business-central-parent/jbpm-server-distribution/pom.xml b/business-central-parent/jbpm-server-distribution/pom.xml index 41f76cb5c9..6cac06f5dc 100644 --- a/business-central-parent/jbpm-server-distribution/pom.xml +++ b/business-central-parent/jbpm-server-distribution/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>jbpm-server-distribution</artifactId> <packaging>pom</packaging> diff --git a/business-central-parent/pom.xml b/business-central-parent/pom.xml index 83e5319fa3..b9e0eeb33d 100644 --- a/business-central-parent/pom.xml +++ b/business-central-parent/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>kie-wb-distributions</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-parent</artifactId> diff --git a/business-central-tests/business-central-tests-gui/pom.xml b/business-central-tests/business-central-tests-gui/pom.xml index 9a10475d3b..646abbd2ae 100644 --- a/business-central-tests/business-central-tests-gui/pom.xml +++ b/business-central-tests/business-central-tests-gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-tests</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>business-central-tests-gui</artifactId> diff --git a/business-central-tests/business-central-tests-rest/pom.xml b/business-central-tests/business-central-tests-rest/pom.xml index d82eecd0d0..5f982bb604 100644 --- a/business-central-tests/business-central-tests-rest/pom.xml +++ b/business-central-tests/business-central-tests-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>business-central-tests</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/business-central-tests/pom.xml b/business-central-tests/pom.xml index 44061ac0d7..ceea764e85 100644 --- a/business-central-tests/pom.xml +++ b/business-central-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>kie-wb-distributions</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index b2cf748016..b792247c75 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.kie</groupId> <artifactId>kie-parent</artifactId> - <version>7.48.0-SNAPSHOT</version> + <version>7.49.0-SNAPSHOT</version> </parent> <artifactId>kie-wb-distributions</artifactId>
0
252f2f514430567c046d1e6b3d5eda71660c91ed
https://github.com/GNOME/gnome-shell/commit/252f2f514430567c046d1e6b3d5eda71660c91ed
cleanup: Define GObject accessors in camelCase gjs is smart enough to match a propertyName getter/setter to the corresponding property-name GObject property, so use that and get rid of the eslint camelcase rule exceptions. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1611>
diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js index 5f727f3ca2..c73c93e7fd 100644 --- a/js/misc/modemManager.js +++ b/js/misc/modemManager.js @@ -117,13 +117,11 @@ var ModemBase = GObject.registerClass({ this._signalQuality = 0; } - // eslint-disable-next-line camelcase - get operator_name() { + get operatorName() { return this._operatorName; } - // eslint-disable-next-line camelcase - get signal_quality() { + get signalQuality() { return this._signalQuality; } diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js index 1cd6576488..10cab9a9e2 100644 --- a/js/misc/systemActions.js +++ b/js/misc/systemActions.js @@ -182,43 +182,35 @@ const SystemActions = GObject.registerClass({ this._sessionUpdated(); } - // eslint-disable-next-line camelcase - get can_power_off() { + get canPowerOff() { return this._actions.get(POWER_OFF_ACTION_ID).available; } - // eslint-disable-next-line camelcase - get can_restart() { + get canRestart() { return this._actions.get(RESTART_ACTION_ID).available; } - // eslint-disable-next-line camelcase - get can_suspend() { + get canSuspend() { return this._actions.get(SUSPEND_ACTION_ID).available; } - // eslint-disable-next-line camelcase - get can_lock_screen() { + get canLockScreen() { return this._actions.get(LOCK_SCREEN_ACTION_ID).available; } - // eslint-disable-next-line camelcase - get can_switch_user() { + get canSwitchUser() { return this._actions.get(SWITCH_USER_ACTION_ID).available; } - // eslint-disable-next-line camelcase - get can_logout() { + get canLogout() { return this._actions.get(LOGOUT_ACTION_ID).available; } - // eslint-disable-next-line camelcase - get can_lock_orientation() { + get canLockOrientation() { return this._actions.get(LOCK_ORIENTATION_ACTION_ID).available; } - // eslint-disable-next-line camelcase - get orientation_lock_icon() { + get orientationLockIcon() { return this._actions.get(LOCK_ORIENTATION_ACTION_ID).iconName; } diff --git a/js/ui/barLevel.js b/js/ui/barLevel.js index f4fdb6e51a..25d4835280 100644 --- a/js/ui/barLevel.js +++ b/js/ui/barLevel.js @@ -60,13 +60,11 @@ var BarLevel = GObject.registerClass({ this.queue_repaint(); } - // eslint-disable-next-line camelcase - get maximum_value() { + get maximumValue() { return this._maxValue; } - // eslint-disable-next-line camelcase - set maximum_value(value) { + set maximumValue(value) { value = Math.max(value, 1); if (this._maxValue == value) @@ -78,13 +76,11 @@ var BarLevel = GObject.registerClass({ this.queue_repaint(); } - // eslint-disable-next-line camelcase - get overdrive_start() { + get overdriveStart() { return this._overdriveStart; } - // eslint-disable-next-line camelcase - set overdrive_start(value) { + set overdriveStart(value) { if (this._overdriveStart == value) return; diff --git a/js/ui/dialog.js b/js/ui/dialog.js index 4af154d6f7..3e8bfee7d5 100644 --- a/js/ui/dialog.js +++ b/js/ui/dialog.js @@ -336,13 +336,11 @@ var ListSectionItem = GObject.registerClass({ this.add_child(textLayout); } - // eslint-disable-next-line camelcase - get icon_actor() { + get iconActor() { return this._iconActorBin.get_child(); } - // eslint-disable-next-line camelcase - set icon_actor(actor) { + set iconActor(actor) { this._iconActorBin.set_child(actor); this.notify('icon-actor'); } diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js index fde6c702ba..e8ac2b07ed 100644 --- a/js/ui/iconGrid.js +++ b/js/ui/iconGrid.js @@ -1090,8 +1090,7 @@ var IconGridLayout = GObject.registerClass({ return [null, DragLocation.EMPTY_SPACE]; } - // eslint-disable-next-line camelcase - get icon_size() { + get iconSize() { return this._iconSize; } diff --git a/js/ui/layout.js b/js/ui/layout.js index b082ec80b0..1a41a34beb 100644 --- a/js/ui/layout.js +++ b/js/ui/layout.js @@ -79,13 +79,11 @@ var MonitorConstraint = GObject.registerClass({ this.notify('index'); } - // eslint-disable-next-line camelcase - get work_area() { + get workArea() { return this._workArea; } - // eslint-disable-next-line camelcase - set work_area(v) { + set workArea(v) { if (v == this._workArea) return; this._workArea = v; diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js index a402fad7ef..ed207415ad 100644 --- a/js/ui/padOsd.js +++ b/js/ui/padOsd.js @@ -322,13 +322,11 @@ var PadDiagram = GObject.registerClass({ this._initLabels(); } - // eslint-disable-next-line camelcase - get editor_actor() { + get editorActor() { return this._editorActor; } - // eslint-disable-next-line camelcase - set editor_actor(actor) { + set editorActor(actor) { actor.hide(); this._editorActor = actor; this.add_actor(actor); diff --git a/js/ui/windowPreview.js b/js/ui/windowPreview.js index b17c87be3b..fddb62e26e 100644 --- a/js/ui/windowPreview.js +++ b/js/ui/windowPreview.js @@ -188,8 +188,7 @@ var WindowPreviewLayout = GObject.registerClass({ return [...this._windows.values()].map(i => i.metaWindow); } - // eslint-disable-next-line camelcase - get bounding_box() { + get boundingBox() { return this._boundingBox; } }); @@ -631,13 +630,11 @@ var WindowPreview = GObject.registerClass({ }; } - // eslint-disable-next-line camelcase - get overlay_enabled() { + get overlayEnabled() { return this._overlayEnabled; } - // eslint-disable-next-line camelcase - set overlay_enabled(enabled) { + set overlayEnabled(enabled) { if (this._overlayEnabled === enabled) return; diff --git a/js/ui/workspace.js b/js/ui/workspace.js index 951f452193..b3ca4cca52 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -851,13 +851,11 @@ var WorkspaceLayout = GObject.registerClass({ this.layout_changed(); } - // eslint-disable-next-line camelcase - get layout_frozen() { + get layoutFrozen() { return this._layoutFrozen; } - // eslint-disable-next-line camelcase - set layout_frozen(f) { + set layoutFrozen(f) { if (this._layoutFrozen === f) return; diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js index f74c8fecbe..40a33fe3a3 100644 --- a/js/ui/workspaceThumbnail.js +++ b/js/ui/workspaceThumbnail.js @@ -334,8 +334,7 @@ var WorkspaceThumbnail = GObject.registerClass({ } } - // eslint-disable-next-line camelcase - set slide_position(slidePosition) { + set slidePosition(slidePosition) { if (this._slidePosition == slidePosition) return; @@ -348,13 +347,11 @@ var WorkspaceThumbnail = GObject.registerClass({ this.queue_relayout(); } - // eslint-disable-next-line camelcase - get slide_position() { + get slidePosition() { return this._slidePosition; } - // eslint-disable-next-line camelcase - set collapse_fraction(collapseFraction) { + set collapseFraction(collapseFraction) { if (this._collapseFraction == collapseFraction) return; this._collapseFraction = collapseFraction; @@ -362,8 +359,7 @@ var WorkspaceThumbnail = GObject.registerClass({ this.queue_relayout(); } - // eslint-disable-next-line camelcase - get collapse_fraction() { + get collapseFraction() { return this._collapseFraction; }
0
a41ce6892cb0590b2e658704434ac0dbcb6834c8
https://github.com/apache/commons-compress/commit/a41ce6892cb0590b2e658704434ac0dbcb6834c8
COMPRESS-463 throw exception when detecting a truncated stored entry
diff --git a/src/changes/changes.xml b/src/changes/changes.xml index bb477f369..7546871d3 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -74,6 +74,11 @@ The <action> type attribute can be add,update,fix,remove. It is now possible to specify the arguments of zstd-jni's ZstdOutputStream constructors via Commons Compress as well. </action> + <action issue="COMPRESS-463" type="fix" date="2018-08-09"> + ZipArchiveInputStream#read would silently return -1 on a + corrupted stored entry and even return > 0 after hitting the + end of the archive. + </action> </release> <release version="1.17" date="2018-06-03" description="Release 1.17"> diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java index 0a2c1aa00..e1995d7aa 100644 --- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java +++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java @@ -525,7 +525,8 @@ private int readStored(final byte[] buffer, final int offset, final int length) buf.position(0); final int l = in.read(buf.array()); if (l == -1) { - return -1; + buf.limit(0); + throw new IOException("Truncated ZIP file"); } buf.limit(l); diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java index c28f3dec4..0a905e3ab 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java @@ -96,6 +96,13 @@ public void testRead7ZipMultiVolumeArchiveForStream() throws IOException { assertEquals("Truncated ZIP file", e.getMessage()); } + try { + zi.read(buffer); + fail("shouldn't be able to read from truncated entry after exception"); + } catch (final IOException e) { + assertEquals("Truncated ZIP file", e.getMessage()); + } + // and now we get another entry, which should also yield // an exception try { diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java index 5b6595682..b9395fbfd 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java @@ -421,6 +421,75 @@ private void multiByteReadConsistentlyReturnsMinusOneAtEof(File file) throws Exc } } + @Test + public void singleByteReadThrowsAtEofForCorruptedStoredEntry() throws Exception { + byte[] content; + try (FileInputStream fs = new FileInputStream(getFile("COMPRESS-264.zip"))) { + content = IOUtils.toByteArray(fs); + } + // make size much bigger than entry's real size + for (int i = 17; i < 26; i++) { + content[i] = (byte) 0xff; + } + try (ByteArrayInputStream in = new ByteArrayInputStream(content); + ZipArchiveInputStream archive = new ZipArchiveInputStream(in)) { + ArchiveEntry e = archive.getNextEntry(); + try { + IOUtils.toByteArray(archive); + fail("expected exception"); + } catch (IOException ex) { + assertEquals("Truncated ZIP file", ex.getMessage()); + } + try { + archive.read(); + fail("expected exception"); + } catch (IOException ex) { + assertEquals("Truncated ZIP file", ex.getMessage()); + } + try { + archive.read(); + fail("expected exception"); + } catch (IOException ex) { + assertEquals("Truncated ZIP file", ex.getMessage()); + } + } + } + + @Test + public void multiByteReadThrowsAtEofForCorruptedStoredEntry() throws Exception { + byte[] content; + try (FileInputStream fs = new FileInputStream(getFile("COMPRESS-264.zip"))) { + content = IOUtils.toByteArray(fs); + } + // make size much bigger than entry's real size + for (int i = 17; i < 26; i++) { + content[i] = (byte) 0xff; + } + byte[] buf = new byte[2]; + try (ByteArrayInputStream in = new ByteArrayInputStream(content); + ZipArchiveInputStream archive = new ZipArchiveInputStream(in)) { + ArchiveEntry e = archive.getNextEntry(); + try { + IOUtils.toByteArray(archive); + fail("expected exception"); + } catch (IOException ex) { + assertEquals("Truncated ZIP file", ex.getMessage()); + } + try { + archive.read(buf); + fail("expected exception"); + } catch (IOException ex) { + assertEquals("Truncated ZIP file", ex.getMessage()); + } + try { + archive.read(buf); + fail("expected exception"); + } catch (IOException ex) { + assertEquals("Truncated ZIP file", ex.getMessage()); + } + } + } + private static byte[] readEntry(ZipArchiveInputStream zip, ZipArchiveEntry zae) throws IOException { final int len = (int)zae.getSize(); final byte[] buff = new byte[len];
1
b1fc952c7600b825c4b02e2789ddafdea18c8d13#diff-0e9aa589be0cec73df5f154aa40f5b06
https://github.com/gnuboard/gnuboard5/commit/b1fc952c7600b825c4b02e2789ddafdea18c8d13#diff-0e9aa589be0cec73df5f154aa40f5b06
XSS 취약점 수정
diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index df2b9b2c1..73e162d98 100644 --- a/adm/boardgroup_form.php +++ b/adm/boardgroup_form.php @@ -12,7 +12,7 @@ if ($w == '') { $gr_id_attr = 'required'; $sound_only = '<strong class="sound_only"> 필수</strong>'; - $gr['gr_use_access'] = 0; + $gr = array('gr_use_access' => 0); $html_title .= ' 생성'; } else if ($w == 'u') { $gr_id_attr = 'readonly'; diff --git a/adm/boardgroup_form_update.php b/adm/boardgroup_form_update.php index c29558fdd..7ce694a8e 100644 --- a/adm/boardgroup_form_update.php +++ b/adm/boardgroup_form_update.php @@ -16,7 +16,9 @@ if (!$gr_subject) alert('그룹 제목을 입력하세요.'); -$sql_common = " gr_subject = '{$_POST['gr_subject']}', +$gr_subject = isset($_POST['gr_subject']) ? strip_tags($_POST['gr_subject']) : ''; + +$sql_common = " gr_subject = '{$gr_subject}', gr_device = '{$_POST['gr_device']}', gr_admin = '{$_POST['gr_admin']}', gr_1_subj = '{$_POST['gr_1_subj']}', diff --git a/adm/boardgroup_list_update.php b/adm/boardgroup_list_update.php index c10cd247f..fbf9e2f1a 100644 --- a/adm/boardgroup_list_update.php +++ b/adm/boardgroup_list_update.php @@ -19,10 +19,11 @@ { $k = $_POST['chk'][$i]; $gr_id = $_POST['group_id'][$k]; + $gr_subject = strip_tags($_POST['gr_subject'][$k]); if($_POST['act_button'] == '선택수정') { $sql = " update {$g5['group_table']} - set gr_subject = '{$_POST['gr_subject'][$k]}', + set gr_subject = '{$gr_subject}', gr_device = '{$_POST['gr_device'][$k]}', gr_admin = '{$_POST['gr_admin'][$k]}', gr_use_access = '{$_POST['gr_use_access'][$k]}', diff --git a/adm/contentform.php b/adm/contentform.php index 024a17615..7ebe8bf01 100644 --- a/adm/contentform.php +++ b/adm/contentform.php @@ -49,9 +49,11 @@ else { $html_title .= ' 입력'; - $co['co_html'] = 2; - $co['co_skin'] = 'basic'; - $co['co_mobile_skin'] = 'basic'; + $co = array( + 'co_html' => 2, + 'co_skin' => 'basic', + 'co_mobile_skin' => 'basic' + ); } include_once (G5_ADMIN_PATH.'/admin.head.php'); diff --git a/adm/contentformupdate.php b/adm/contentformupdate.php index d344c4707..dff780a39 100644 --- a/adm/contentformupdate.php +++ b/adm/contentformupdate.php @@ -20,6 +20,7 @@ $co_row = sql_fetch($sql); } +$co_subject = strip_tags($co_subject); $co_include_head = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($co_include_head, 0, 255)); $co_include_tail = preg_replace(array("#[\\\]+$#", "#(<\?php|<\?)#i"), "", substr($co_include_tail, 0, 255)); diff --git a/adm/faqmasterform.php b/adm/faqmasterform.php index df87fec03..d48f69e49 100644 --- a/adm/faqmasterform.php +++ b/adm/faqmasterform.php @@ -21,6 +21,7 @@ else { $html_title .= ' 입력'; + $fm = array(); } $g5['title'] = $html_title.' 관리'; diff --git a/adm/faqmasterformupdate.php b/adm/faqmasterformupdate.php index fed67d644..f753683e3 100644 --- a/adm/faqmasterformupdate.php +++ b/adm/faqmasterformupdate.php @@ -18,6 +18,8 @@ if ($fm_himg_del) @unlink(G5_DATA_PATH."/faq/{$fm_id}_h"); if ($fm_timg_del) @unlink(G5_DATA_PATH."/faq/{$fm_id}_t"); +$fm_subject = strip_tags($fm_subject); + $sql_common = " set fm_subject = '$fm_subject', fm_head_html = '$fm_head_html', fm_tail_html = '$fm_tail_html', diff --git a/adm/newwinform.php b/adm/newwinform.php index 1e64f41e2..10aab222d 100644 --- a/adm/newwinform.php +++ b/adm/newwinform.php @@ -109,7 +109,7 @@ <tr> <th scope="row"><label for="nw_subject">팝업 제목<strong class="sound_only"> 필수</strong></label></th> <td> - <input type="text" name="nw_subject" value="<?php echo stripslashes($nw['nw_subject']) ?>" id="nw_subject" required class="frm_input required" size="80"> + <input type="text" name="nw_subject" value="<?php echo get_sanitize_input($nw['nw_subject']); ?>" id="nw_subject" required class="frm_input required" size="80"> </td> </tr> <tr> diff --git a/adm/newwinformupdate.php b/adm/newwinformupdate.php index 191e54a3a..1441ac820 100644 --- a/adm/newwinformupdate.php +++ b/adm/newwinformupdate.php @@ -12,6 +12,8 @@ check_admin_token(); +$nw_subject = isset($_POST['nw_subject']) ? strip_tags($_POST['nw_subject']) : ''; + $sql_common = " nw_device = '{$_POST['nw_device']}', nw_begin_time = '{$_POST['nw_begin_time']}', nw_end_time = '{$_POST['nw_end_time']}', @@ -20,7 +22,7 @@ nw_top = '{$_POST['nw_top']}', nw_height = '{$_POST['nw_height']}', nw_width = '{$_POST['nw_width']}', - nw_subject = '{$_POST['nw_subject']}', + nw_subject = '{$nw_subject}', nw_content = '{$_POST['nw_content']}', nw_content_html = '{$_POST['nw_content_html']}' "; diff --git a/adm/point_update.php b/adm/point_update.php index 2240e6022..571a1dfa6 100644 --- a/adm/point_update.php +++ b/adm/point_update.php @@ -6,9 +6,9 @@ check_admin_token(); -$mb_id = $_POST['mb_id']; -$po_point = $_POST['po_point']; -$po_content = $_POST['po_content']; +$mb_id = strip_tags($_POST['mb_id']); +$po_point = strip_tags($_POST['po_point']); +$po_content = strip_tags($_POST['po_content']); $expire = preg_replace('/[^0-9]/', '', $_POST['po_expire_term']); $mb = get_member($mb_id); diff --git a/adm/sms_admin/num_book_update.php b/adm/sms_admin/num_book_update.php index 578c482df..0a13c641f 100644 --- a/adm/sms_admin/num_book_update.php +++ b/adm/sms_admin/num_book_update.php @@ -21,6 +21,8 @@ if (!strlen(trim($bk_name))) alert('이름을 입력해주세요'); + $bk_name = strip_tags($bk_name); + if ($bk_hp == '') alert('휴대폰번호만 입력 가능합니다.'); /* diff --git a/adm/sms_admin/num_book_write.php b/adm/sms_admin/num_book_write.php index 2e05a4b67..06896f81e 100644 --- a/adm/sms_admin/num_book_write.php +++ b/adm/sms_admin/num_book_write.php @@ -30,7 +30,7 @@ $g5['title'] .= '수정'; } else { - $write['bg_no'] = $bg_no; + $write = array('bg_no' => (int) $bg_no); $g5['title'] .= '추가'; } @@ -74,7 +74,7 @@ </tr> <tr> <th scope="row"><label for="bk_name">이름<strong class="sound_only"> 필수</strong></label></th> - <td><input type="text" name="bk_name" id="bk_name" maxlength="50" value="<?php echo $write['bk_name']?>" required class="frm_input required"></td> + <td><input type="text" name="bk_name" id="bk_name" maxlength="50" value="<?php echo get_sanitize_input($write['bk_name']); ?>" required class="frm_input required"></td> </tr> <tr> <th scope="row"><label for="bk_hp">휴대폰번호<strong class="sound_only"> 필수</strong></label></th>
1
4a7c27bfe98f409623d4d857894d017ff0672cc9#diff-515c81af848352583bff286d6224875f
https://github.com/viabtc/viabtc_exchange_server/commit/4a7c27bfe98f409623d4d857894d017ff0672cc9#diff-515c81af848352583bff286d6224875f
Merge pull request #131 from benjaminchodroff/master fix memory corruption and other 32bit overflows
diff --git a/network/nw_buf.c b/network/nw_buf.c index f338af5f..fa42b0a5 100644 --- a/network/nw_buf.c +++ b/network/nw_buf.c @@ -8,7 +8,9 @@ # include "nw_buf.h" # define NW_BUF_POOL_INIT_SIZE 64 +# define NW_BUF_POOL_MAX_SIZE 65535 # define NW_CACHE_INIT_SIZE 64 +# define NW_CACHE_MAX_SIZE 65535 size_t nw_buf_size(nw_buf *buf) { @@ -85,7 +87,7 @@ void nw_buf_free(nw_buf_pool *pool, nw_buf *buf) { if (pool->free < pool->free_total) { pool->free_arr[pool->free++] = buf; - } else { + } else if (pool->free_total < NW_BUF_POOL_MAX_SIZE) { uint32_t new_free_total = pool->free_total * 2; void *new_arr = realloc(pool->free_arr, new_free_total * sizeof(nw_buf *)); if (new_arr) { @@ -95,6 +97,8 @@ void nw_buf_free(nw_buf_pool *pool, nw_buf *buf) } else { free(buf); } + } else { + free(buf); } } @@ -230,7 +234,7 @@ void nw_cache_free(nw_cache *cache, void *obj) { if (cache->free < cache->free_total) { cache->free_arr[cache->free++] = obj; - } else { + } else if (cache->free_total < NW_CACHE_MAX_SIZE) { uint32_t new_free_total = cache->free_total * 2; void *new_arr = realloc(cache->free_arr, new_free_total * sizeof(void *)); if (new_arr) { @@ -240,6 +244,8 @@ void nw_cache_free(nw_cache *cache, void *obj) } else { free(obj); } + } else { + free(obj); } } diff --git a/utils/ut_rpc.c b/utils/ut_rpc.c index 4ade964b..14d0429a 100644 --- a/utils/ut_rpc.c +++ b/utils/ut_rpc.c @@ -44,13 +44,19 @@ int rpc_pack(rpc_pkg *pkg, void **data, uint32_t *size) { static void *send_buf; static size_t send_buf_size; - uint32_t pkg_size = RPC_PKG_HEAD_SIZE + pkg->ext_size + pkg->body_size; + uint32_t pkg_size; + if (pkg->body_size > RPC_PKG_MAX_BODY_SIZE) { + return -1; + } + pkg_size = RPC_PKG_HEAD_SIZE + pkg->ext_size + pkg->body_size; if (send_buf_size < pkg_size) { if (send_buf) free(send_buf); send_buf_size = pkg_size * 2; send_buf = malloc(send_buf_size); - assert(send_buf != NULL); + if (send_buf == NULL) { + return -1; + } } memcpy(send_buf, pkg, RPC_PKG_HEAD_SIZE); diff --git a/utils/ut_rpc.h b/utils/ut_rpc.h index a30cf534..2c7b2179 100644 --- a/utils/ut_rpc.h +++ b/utils/ut_rpc.h @@ -32,6 +32,7 @@ typedef struct rpc_pkg { # pragma pack() # define RPC_PKG_HEAD_SIZE (sizeof(rpc_pkg) - sizeof(void *) * 2) +# define RPC_PKG_MAX_BODY_SIZE ((UINT32_MAX / 2) - UINT16_MAX - sizeof(rpc_pkg)) int rpc_decode(nw_ses *ses, void *data, size_t max); int rpc_pack(rpc_pkg *pkg, void **data, uint32_t *size); diff --git a/utils/ut_ws_svr.c b/utils/ut_ws_svr.c index 5dfb87b4..5a4b8b10 100644 --- a/utils/ut_ws_svr.c +++ b/utils/ut_ws_svr.c @@ -129,7 +129,7 @@ static int on_http_message_complete(http_parser* parser) if (upgrade == NULL || strcasecmp(upgrade, "websocket") != 0) goto error; const char *connection = http_request_get_header(info->request, "Connection"); - if (connection == NULL) + if (connection == NULL || strlen(connection) > UT_WS_SVR_MAX_HEADER_SIZE) goto error; else { bool found_upgrade = false; diff --git a/utils/ut_ws_svr.h b/utils/ut_ws_svr.h index d3fcf0f9..11c53d47 100644 --- a/utils/ut_ws_svr.h +++ b/utils/ut_ws_svr.h @@ -12,6 +12,8 @@ # include "nw_buf.h" # include "nw_timer.h" +# define UT_WS_SVR_MAX_HEADER_SIZE 1024 + typedef struct ws_svr_cfg { uint32_t bind_count; nw_svr_bind *bind_arr;
1
33debe4f247fae4afaec14a95ab92119aad3c697
https://github.com/GNOME/nautilus/commit/33debe4f247fae4afaec14a95ab92119aad3c697
file-operations: Fix directory "skipped" flag During a "merge" directory copy operation, when recursively merging a directory to a destination directory that already contains some files or subdirectories that are being copied, the "skip" flag is set individually for those files or subdirectories. This correctly reduces the count total files being copied for each file or subdirectory that was skipped. However, the "skipped" flag was then also being set for the parent directory even though that directory was successfully copied (when represented as a single file which is also included in the file count). This ended up incorrectly reducing the total file count even though the copied file count was incremented for that directory. Change code to ensure that the "skipped" flag is not set for a directory when one or more children are skipped.
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c index c007f76259..3bd7d55aa9 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -4776,6 +4776,7 @@ copy_move_directory (CopyMoveJob *copy_job, GFileCopyFlags flags; job = (CommonJob *) copy_job; + *skipped_file = FALSE; if (create_dest) { @@ -4979,7 +4980,7 @@ copy_move_directory (CopyMoveJob *copy_job, else if (response == 1) { /* Skip: Do Nothing */ - local_skipped_file = TRUE; + *skipped_file = TRUE; } else if (response == 2) { @@ -5003,6 +5004,7 @@ copy_move_directory (CopyMoveJob *copy_job, if (!job_aborted (job) && copy_job->is_move && /* Don't delete source if there was a skipped file */ + !*skipped_file && !local_skipped_file) { if (!g_file_delete (src, job->cancellable, &error)) @@ -5011,7 +5013,7 @@ copy_move_directory (CopyMoveJob *copy_job, if (job->skip_all_error) { - local_skipped_file = TRUE; + *skipped_file = TRUE; goto skip; } basename = get_basename (src); @@ -5033,11 +5035,11 @@ copy_move_directory (CopyMoveJob *copy_job, else if (response == 1) /* skip all */ { job->skip_all_error = TRUE; - local_skipped_file = TRUE; + *skipped_file = TRUE; } else if (response == 2) /* skip */ { - local_skipped_file = TRUE; + *skipped_file = TRUE; } else { @@ -5049,11 +5051,6 @@ copy_move_directory (CopyMoveJob *copy_job, } } - if (local_skipped_file) - { - *skipped_file = TRUE; - } - g_free (dest_fs_type); return TRUE; }
0
4206686bd24f1c274b9d9237db83184f9aaddf8a
https://github.com/mayan-edms/mayan-edms/commit/4206686bd24f1c274b9d9237db83184f9aaddf8a
Remove usage of `auto_upload_document` The correct test property is now `auto_upload_test_document`. Signed-off-by: Roberto Rosario <[email protected]>
diff --git a/mayan/apps/document_states/tests/test_models.py b/mayan/apps/document_states/tests/test_models.py index 6934473b2ff..29b5edf3be0 100644 --- a/mayan/apps/document_states/tests/test_models.py +++ b/mayan/apps/document_states/tests/test_models.py @@ -21,7 +21,7 @@ class WorkflowInstanceModelTestCase( WorkflowTestMixin, GenericDocumentTestCase ): - auto_upload_document = False + auto_upload_test_document = False def setUp(self): super().setUp() diff --git a/mayan/apps/document_states/tests/test_workflow_views.py b/mayan/apps/document_states/tests/test_workflow_views.py index 75990481ca4..7ecb26f22bf 100644 --- a/mayan/apps/document_states/tests/test_workflow_views.py +++ b/mayan/apps/document_states/tests/test_workflow_views.py @@ -19,7 +19,7 @@ class DocumentWorkflowTemplateViewTestCase( DocumentWorkflowTemplateViewTestMixin, WorkflowTestMixin, GenericDocumentViewTestCase ): - auto_upload_document = False + auto_upload_test_document = False def setUp(self): super().setUp() @@ -31,6 +31,7 @@ def setUp(self): self.test_workflow.save() def test_document_single_workflow_launch_view_no_permission(self): + self._upload_test_document() workflow_instance_count = self.test_document.workflows.count() response = self._request_test_document_single_workflow_launch_view() @@ -41,6 +42,7 @@ def test_document_single_workflow_launch_view_no_permission(self): ) def test_document_single_workflow_launch_view_with_document_access(self): + self._upload_test_document() self.grant_access( obj=self.test_document, permission=permission_workflow_tools ) @@ -55,6 +57,7 @@ def test_document_single_workflow_launch_view_with_document_access(self): ) def test_document_single_workflow_launch_view_with_workflow_access(self): + self._upload_test_document() self.grant_access( obj=self.test_workflow, permission=permission_workflow_tools ) @@ -69,6 +72,7 @@ def test_document_single_workflow_launch_view_with_workflow_access(self): ) def test_document_single_workflow_launch_view_with_full_access(self): + self._upload_test_document() self.grant_access( obj=self.test_document, permission=permission_workflow_tools ) diff --git a/mayan/apps/metadata/tests/test_api.py b/mayan/apps/metadata/tests/test_api.py index afe2bf76cf6..22a8891632a 100644 --- a/mayan/apps/metadata/tests/test_api.py +++ b/mayan/apps/metadata/tests/test_api.py @@ -661,7 +661,7 @@ def test_document_metadata_put_default_value_view_with_full_access(self): class DocumentStubMetadataAPITestCase(DocumentMetadataAPIViewTestCase): - auto_upload_document = False + auto_upload_test_document = False def setUp(self): super().setUp() diff --git a/mayan/apps/tags/tests/test_api.py b/mayan/apps/tags/tests/test_api.py index 9dcdc8fece0..2f8994a22f0 100644 --- a/mayan/apps/tags/tests/test_api.py +++ b/mayan/apps/tags/tests/test_api.py @@ -408,7 +408,7 @@ def test_document_tag_remove_view_with_full_access(self): class TagDocumentStubAPIViewTestCase(TagDocumentAPIViewTestCase): - auto_upload_document = False + auto_upload_test_document = False def setUp(self): super().setUp()
0
00c0ee7bc4b8492476b377a6edafcc33411f14b
https://github.com/apache/hive/commit/00c0ee7bc4b8492476b377a6edafcc33411f14b
HIVE-20420: Provide a fallback authorizer when no other authorizer is in use (Daniel Dai, reviewed by Laszlo Pinter, Thejas Nair) Signed-off-by: Thejas M Nair <[email protected]>
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/fallback/FallbackHiveAuthorizer.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/fallback/FallbackHiveAuthorizer.java index 10cf4d4fd861..07f0a4ebb25a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/fallback/FallbackHiveAuthorizer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/fallback/FallbackHiveAuthorizer.java @@ -154,7 +154,13 @@ private void checkPrivileges(HiveOperationType hiveOpType, List<HivePrivilegeObj if (hiveObjects == null) { return; } - if (admins != null && Arrays.stream(admins).parallel().anyMatch(n -> n.equals(userName))) { + + boolean isAdmin = false; + if (admins != null && admins.length > 0) { + isAdmin = Arrays.asList(admins).contains(userName); + } + + if (isAdmin) { return; // Skip rest of checks if user is admin } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java index 18b0e1c49b43..cb07c538edba 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java @@ -113,6 +113,7 @@ public HivePrivilegeObjectType getObjectType() { } private static Map<HiveOperationType, List<PrivRequirement>> op2Priv; + private static List<HiveOperationType> adminPrivOps; private static SQLPrivTypeGrant[] OWNER_PRIV_AR = arr(SQLPrivTypeGrant.OWNER_PRIV); private static SQLPrivTypeGrant[] SEL_NOGRANT_AR = arr(SQLPrivTypeGrant.SELECT_NOGRANT); @@ -130,6 +131,7 @@ public HivePrivilegeObjectType getObjectType() { static { + adminPrivOps = new ArrayList<HiveOperationType>(); op2Priv = new HashMap<HiveOperationType, List<PrivRequirement>>(); op2Priv.put(HiveOperationType.EXPLAIN, PrivRequirement.newIOPrivRequirement @@ -292,6 +294,8 @@ public HivePrivilegeObjectType getObjectType() { new PrivRequirement(arr(SQLPrivTypeGrant.INSERT_NOGRANT, SQLPrivTypeGrant.DELETE_NOGRANT), IOType.OUTPUT, null, HivePrivilegeObjectType.TABLE_OR_VIEW), new PrivRequirement(OWNER_PRIV_AR, IOType.OUTPUT, null, HivePrivilegeObjectType.DATABASE))); + adminPrivOps.add(HiveOperationType.CREATEFUNCTION); + adminPrivOps.add(HiveOperationType.DROPFUNCTION); // operations require select priv op2Priv.put(HiveOperationType.SHOWCOLUMNS, PrivRequirement.newIOPrivRequirement @@ -500,6 +504,17 @@ public static RequiredPrivileges getRequiredPrivs(HiveOperationType hiveOpType, return reqPrivs; } + /** + * Some operations are tagged as requiring admin privileges, ignoring any object that + * might be checked on it. This check is run in those cases. + * + * @param hiveOpType + * @return + */ + public static boolean isAdminPrivOperation(HiveOperationType hiveOpType) { + return adminPrivOps.contains(hiveOpType); + } + // for unit tests public static Set<HiveOperationType> getOperationTypes() { return op2Priv.keySet();
1
06b58aa3345d2f977553685a026b93e61f0c491e
https://github.com/narkisr/nmap4j/commit/06b58aa3345d2f977553685a026b93e61f0c491e
Adding hosts validation fixing https://github.com/narkisr/nmap4j/issues/9
diff --git a/src/main/java/org/nmap4j/Nmap4j.java b/src/main/java/org/nmap4j/Nmap4j.java index 80294b4..e02865e 100644 --- a/src/main/java/org/nmap4j/Nmap4j.java +++ b/src/main/java/org/nmap4j/Nmap4j.java @@ -8,10 +8,11 @@ import org.nmap4j.core.nmap.NMapProperties; import org.nmap4j.data.NMapRun; import org.nmap4j.parser.OnePassParser; +import org.nmap4j.valid.HostsInputValidator; /** - * This is the simplified way to execute and parse Nmap output. This is the + * This is the simplified way to execute and parse Nmap output. This is the * easiest way to run Nmap from this API. Use of this class requires a little * more knowledge of Nmap's flags in order to work. * <p> @@ -21,127 +22,135 @@ * nmap4j.includeHosts( "192.168.1.1-255" ) ; * nmap4j.excludeHosts( "192.168.1.110" ) ; * nmap4j.addFlags( "-T3 -oX - -O -sV" ) ; - * nmap4j.execute() ; + * nmap4j.execute() ; * if( !nma4j.hasError() ) { - * NMapRun nmapRun = nmap4j.getResults() ; + * NMapRun nmapRun = nmap4j.getResults() ; * } else { - * System.out.println( nmap4j.getExecutionResults().getErrors() ) ; + * System.out.println( nmap4j.getExecutionResults().getErrors() ) ; * } * </code> * <p> * This block would need a try/catch because the execute() method throws two * different exceptions. - * - * @author jsvede * + * @author jsvede */ public class Nmap4j implements INmap4j { - - private NMapProperties nmapProperties ; - private ArgumentProperties flags ; - private NMapExecutor nmapExecutor ; - private ExecutionResults results ; - - /** - * Constructs this object with the path specified. This path needs to be - * the path to your Nmap binary. On many systems this will be something - * like "/usr/local". Additionally, this will also be the path to the - * data dir required by Nmap. - * @param path - */ - public Nmap4j( String path ) { - nmapProperties = new NMapProperties( path ) ; - flags = new ArgumentProperties() ; - } - - /** - * Executes the nmap scan with the parameters set. You should have - * called addFlags() with appropriate Nmap flags prior to executing the - * scan. - * - * @throws NMapInitializationException - * @throws NMapExecutionException - */ - public void execute() throws NMapInitializationException, NMapExecutionException { - nmapExecutor = new NMapExecutor( flags, nmapProperties ) ; - results = nmapExecutor.execute() ; - } - - /** - * Add the appropriate flags to your scan. Call this method with all the - * flags you will want. For example, if you want to scan for hosts, OS - * information and service information you would pass "-sV -O -T4". This - * method will append "-oX -" if you did not supply it. - * - * @param flagSet - */ - public void addFlags( String flagSet ) { - StringBuilder sb = new StringBuilder() ; - sb.append( flagSet ) ; - if( !flagSet.contains( "-oX" ) ) { - sb.append( " -oX -" ) ; - } - flags.addFlag( sb.toString() ) ; - } - - /** - * Add a list of space delimited hosts that you want to scan. This - * list conforms to the requirements that Nmap sets forth. - * - * @param hosts - */ - public void includeHosts( String hosts ) { - flags.addIncludedHost( hosts ) ; - } - - /** - * Add a list of space delimited hosts to exclude. Usually this is used - * when you specify a large included host list. This allows you specify - * broad ranges host addresses and exclude some hosts within that range. - * - * @param hosts - */ - public void excludeHosts( String hosts ) { - flags.addExcludedHost( hosts ) ; - } - - /** - * Returns the raw output of the execution. - * @return - */ - public String getOutput() { - return results.getOutput() ; - } - - /** - * This method returns an object tree representing the XML nodes. - * - * @return - */ - public NMapRun getResult() { - OnePassParser parser = new OnePassParser() ; - NMapRun nmapRun = parser.parse(results.getOutput(), OnePassParser.STRING_INPUT ) ; - return nmapRun ; - } - - /** - * Checks the output for the word "ERROR" as Nmap will usually produce an - * error message that starts with ERROR though there are other scenarios. If - * the call to getResult() fails check the error output. - * @return - */ - public boolean hasError() { - return results.getErrors().contains( "ERROR") ; - } - - /** - * Use this method to get the raw results of the execution. The - * ExecutionResults contains the raw output, the errors and the - * command that was executed. - * @return - */ - public ExecutionResults getExecutionResults() { - return results ; - } - + + private NMapProperties nmapProperties; + private ArgumentProperties flags; + private NMapExecutor nmapExecutor; + private ExecutionResults results; + private HostsInputValidator validator; + + /** + * Constructs this object with the path specified. This path needs to be + * the path to your Nmap binary. On many systems this will be something + * like "/usr/local". Additionally, this will also be the path to the + * data dir required by Nmap. + * + * @param path + */ + public Nmap4j(String path) { + nmapProperties = new NMapProperties(path); + flags = new ArgumentProperties(); + validator = new HostsInputValidator(); + } + + /** + * Executes the nmap scan with the parameters set. You should have + * called addFlags() with appropriate Nmap flags prior to executing the + * scan. + * + * @throws NMapInitializationException + * @throws NMapExecutionException + */ + public void execute() throws NMapInitializationException, NMapExecutionException { + nmapExecutor = new NMapExecutor(flags, nmapProperties); + results = nmapExecutor.execute(); + } + + /** + * Add the appropriate flags to your scan. Call this method with all the + * flags you will want. For example, if you want to scan for hosts, OS + * information and service information you would pass "-sV -O -T4". This + * method will append "-oX -" if you did not supply it. + * + * @param flagSet + */ + public void addFlags(String flagSet) { + StringBuilder sb = new StringBuilder(); + sb.append(flagSet); + if (!flagSet.contains("-oX")) { + sb.append(" -oX -"); + } + flags.addFlag(sb.toString()); + } + + /** + * Add a list of space delimited hosts that you want to scan. This + * list conforms to the requirements that Nmap sets forth. + * + * @param hosts + */ + public void includeHosts(String hosts) { + if (!validator.valid(hosts)) { + throw new RuntimeException("Non legal hosts parameter"); + } + flags.addIncludedHost(hosts); + } + + /** + * Add a list of space delimited hosts to exclude. Usually this is used + * when you specify a large included host list. This allows you specify + * broad ranges host addresses and exclude some hosts within that range. + * + * @param hosts + */ + public void excludeHosts(String hosts) { + flags.addExcludedHost(hosts); + } + + /** + * Returns the raw output of the execution. + * + * @return + */ + public String getOutput() { + return results.getOutput(); + } + + /** + * This method returns an object tree representing the XML nodes. + * + * @return + */ + public NMapRun getResult() { + OnePassParser parser = new OnePassParser(); + NMapRun nmapRun = parser.parse(results.getOutput(), OnePassParser.STRING_INPUT); + return nmapRun; + } + + /** + * Checks the output for the word "ERROR" as Nmap will usually produce an + * error message that starts with ERROR though there are other scenarios. If + * the call to getResult() fails check the error output. + * + * @return + */ + public boolean hasError() { + return results.getErrors().contains("ERROR"); + } + + /** + * Use this method to get the raw results of the execution. The + * ExecutionResults contains the raw output, the errors and the + * command that was executed. + * + * @return + */ + public ExecutionResults getExecutionResults() { + return results; + } + } diff --git a/src/main/java/org/nmap4j/valid/HostsInputValidator.java b/src/main/java/org/nmap4j/valid/HostsInputValidator.java index e579ef0..31eaa45 100644 --- a/src/main/java/org/nmap4j/valid/HostsInputValidator.java +++ b/src/main/java/org/nmap4j/valid/HostsInputValidator.java @@ -2,26 +2,34 @@ import com.google.common.net.InternetDomainName; +import java.io.File; import java.util.regex.Pattern; -public class HostsValidator { +/** + * nmap can scan over hostname, single ip, subnet, or using a file input + */ +public class HostsInputValidator { private final static String IP_REGEX = "^(([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.){3}([01]?\\d\\d?|2[0-4]\\d|25[0-5])"; private final static String IP_CIDR = "(\\/([0-9]|[1-2][0-9]|3[0-2]))"; public boolean valid(String host) { - return InternetDomainName.isValid(host) || ip(host) || subnet(host); + return InternetDomainName.isValid(host) || isIp(host) || isSubnet(host) || isFile(host); } - private boolean ip(final String ip) { + private boolean isIp(final String ip) { final Pattern PATTERN = Pattern.compile(IP_REGEX + "$"); return PATTERN.matcher(ip).matches(); } - private boolean subnet(final String subnet) { + private boolean isSubnet(final String subnet) { final Pattern PATTERN = Pattern.compile(IP_REGEX + IP_CIDR); return PATTERN.matcher(subnet).matches(); } + private boolean isFile(String host) { + return new File(host).exists(); + } + } diff --git a/src/test/java/org/nmap4j/core/valid/ValidationTest.java b/src/test/java/org/nmap4j/core/valid/ValidationTest.java index 8a8bda4..688685d 100644 --- a/src/test/java/org/nmap4j/core/valid/ValidationTest.java +++ b/src/test/java/org/nmap4j/core/valid/ValidationTest.java @@ -1,4 +1,25 @@ package org.nmap4j.core.valid; +import org.junit.Test; +import org.nmap4j.valid.HostsInputValidator; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class ValidationTest { + + @Test + public void validHosts() { + assertTrue(new HostsInputValidator().valid("8.8.4.3")); + assertTrue(new HostsInputValidator().valid("8.8.4.3/32")); + assertTrue(new HostsInputValidator().valid("google.com")); + } + + @Test + public void nonValidHosts() { + boolean b; + assertFalse(new HostsInputValidator().valid("8.8.4")); + assertFalse(new HostsInputValidator().valid("8.8.4.3/322")); + assertFalse(new HostsInputValidator().valid("google.com.8.8.4.3")); + } }
1
f14d0472d4caabdbec0f3ca0cc3e829d94ac4faf
https://github.com/micromata/projectforge-webapp/commit/f14d0472d4caabdbec0f3ca0cc3e829d94ac4faf
Catched exception fixed.
diff --git a/src/main/java/org/projectforge/web/humanresources/HRPlanningEditPage.java b/src/main/java/org/projectforge/web/humanresources/HRPlanningEditPage.java index e9ffe2c94..b2010b761 100644 --- a/src/main/java/org/projectforge/web/humanresources/HRPlanningEditPage.java +++ b/src/main/java/org/projectforge/web/humanresources/HRPlanningEditPage.java @@ -132,7 +132,7 @@ public void select(final String property, final Object selectedValue) final HRPlanningEntryDO entry = getData().getEntry(idx); hrPlanningDao.setProjekt(entry, (Integer) selectedValue); form.projektSelectPanels.get(idx).getTextField().modelChanged(); - } catch (final ArrayIndexOutOfBoundsException ex) { + } catch (final IndexOutOfBoundsException ex) { log.error("Oups, idx not supported: " + ex.getMessage(), ex); } } else if ("userId".equals(property) == true) {
0
a1d321e79afff6ac67dad65b8cb3d2c37fe56864
https://github.com/arslancb/clipbucket/commit/a1d321e79afff6ac67dad65b8cb3d2c37fe56864
modified : sitemap duration issue fixed
diff --git a/upload/sitemap.php b/upload/sitemap.php index f220d5203..ec32d3ca7 100644 --- a/upload/sitemap.php +++ b/upload/sitemap.php @@ -51,9 +51,7 @@ <video:category><?=strip_tags(categories($video['category'],'video'))?></video:category> <video:family_friendly>yes</video:family_friendly> <video:duration><?php -$defaultime = $video['duration']; -$dotfixed = explode (".",$defaultime); -echo $dotfixed[0].$dotfixed[1]; +echo round($video['duration']); ?></video:duration> </video:video> </url>
0
5562545b5562f6d12a4ef991fae158bf4ccf92b6
https://github.com/libarchive/libarchive/commit/5562545b5562f6d12a4ef991fae158bf4ccf92b6
Avoid a read off-by-one error for UTF16 names in RAR archives. Reported-By: OSS-Fuzz issue 573
diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c index cbb14c32d..751de6979 100644 --- a/libarchive/archive_read_support_format_rar.c +++ b/libarchive/archive_read_support_format_rar.c @@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry, return (ARCHIVE_FATAL); } filename[filename_size++] = '\0'; - filename[filename_size++] = '\0'; + /* + * Do not increment filename_size here as the computations below + * add the space for the terminating NUL explicitly. + */ + filename[filename_size] = '\0'; /* Decoded unicode form is UTF-16BE, so we have to update a string * conversion object for it. */
1
d64e7fa3993dac577c0973e0caf8c31d27ef5e4
https://github.com/spring-projects/spring-amqp/commit/d64e7fa3993dac577c0973e0caf8c31d27ef5e4
AMQP-830 Enable Hostname Verification JIRA: https://jira.spring.io/browse/AMQP-830 * Fix typos and non-relevant sentences
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java index 8639a236df..d8f01938ea 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package org.springframework.amqp.rabbit.connection; +import java.lang.reflect.Method; import java.net.URI; import java.net.URISyntaxException; import java.security.KeyManagementException; import java.security.KeyStore; -import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Arrays; @@ -28,6 +28,7 @@ import java.util.Properties; import java.util.concurrent.ExecutorService; import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicReference; import javax.net.SocketFactory; import javax.net.ssl.KeyManager; @@ -42,6 +43,10 @@ import org.springframework.beans.factory.config.AbstractFactoryBean; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.util.Assert; +import org.springframework.util.ReflectionUtils; +import org.springframework.util.ReflectionUtils.MethodCallback; +import org.springframework.util.ReflectionUtils.MethodFilter; import org.springframework.util.StringUtils; import com.rabbitmq.client.ConnectionFactory; @@ -56,7 +61,7 @@ * setter methods and optionally enabling SSL, with or without * certificate validation. When {@link #setSslPropertiesLocation(Resource) sslPropertiesLocation} * is not null, the default implementation loads a {@code PKCS12} keystore and a - * {@code JKS} truststore using the supplied properties and intializes {@code SunX509} key + * {@code JKS} truststore using the supplied properties and initializes {@code SunX509} key * and trust manager factories. These are then used to initialize an {@link SSLContext} * using the {@link #setSslAlgorithm(String) sslAlgorithm} (default TLSv1.1). * <p> @@ -75,6 +80,19 @@ */ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionFactory> { + private static final Method enableHostnameVerificationNoArgMethod; + + static { + final AtomicReference<Method> method1 = new AtomicReference<>(); + ReflectionUtils.doWithMethods(ConnectionFactory.class, m -> { + if (m.getParameterTypes().length == 0) { + method1.set(m); + } + }, m -> m.getName().equals("enableHostnameVerification")); + + enableHostnameVerificationNoArgMethod = method1.get(); + } + private final Log logger = LogFactory.getLog(getClass()); private static final String KEY_STORE = "keyStore"; @@ -103,30 +121,32 @@ private Resource sslPropertiesLocation; - private volatile String keyStore; + private String keyStore; - private volatile String trustStore; + private String trustStore; - private volatile Resource keyStoreResource; + private Resource keyStoreResource; - private volatile Resource trustStoreResource; + private Resource trustStoreResource; - private volatile String keyStorePassphrase; + private String keyStorePassphrase; - private volatile String trustStorePassphrase; + private String trustStorePassphrase; - private volatile String keyStoreType; + private String keyStoreType; - private volatile String trustStoreType; + private String trustStoreType; - private volatile String sslAlgorithm = TLS_V1_1; + private String sslAlgorithm = TLS_V1_1; - private volatile boolean sslAlgorithmSet; + private boolean sslAlgorithmSet; - private volatile SecureRandom secureRandom; + private SecureRandom secureRandom; private boolean skipServerCertificateValidation; + private boolean enableHostnameVerification; + public RabbitConnectionFactoryBean() { this.connectionFactory.setAutomaticRecoveryEnabled(false); } @@ -604,6 +624,21 @@ public void setChannelRpcTimeout(int channelRpcTimeout) { this.connectionFactory.setChannelRpcTimeout(channelRpcTimeout); } + /** + * Enable server hostname verification for TLS connections. + * <p> + * This enables hostname verification regardless of the IO mode used (blocking or + * non-blocking IO). + * Requires amqp-client 5.4.0 or later. + * @param enable true to enable. + * @since 1.7.10 + */ + public void setEnableHostnameVerification(boolean enable) { + Assert.notNull(enableHostnameVerificationNoArgMethod, + "Host name verification requires amqp-client 5.4.0 or later"); + this.enableHostnameVerification = enable; + } + @Override public Class<?> getObjectType() { return ConnectionFactory.class; @@ -686,6 +721,7 @@ protected void setUpSSL() throws Exception { SSLContext context = createSSLContext(); context.init(keyManagers, trustManagers, this.secureRandom); this.connectionFactory.useSslProtocol(context); + checkHostVerification(); } } @@ -701,14 +737,20 @@ protected SSLContext createSSLContext() throws NoSuchAlgorithmException { } - private void useDefaultTrustStoreMechanism() - throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException { + private void useDefaultTrustStoreMechanism() throws Exception { SSLContext sslContext = SSLContext.getInstance(this.sslAlgorithm); TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); trustManagerFactory.init((KeyStore) null); sslContext.init(null, trustManagerFactory.getTrustManagers(), null); this.connectionFactory.useSslProtocol(sslContext); + checkHostVerification(); + } + + private void checkHostVerification() throws Exception { + if (this.enableHostnameVerification) { + enableHostnameVerificationNoArgMethod.invoke(this.connectionFactory); + } } } diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc index 215beeff12..dd80d5bcc8 100644 --- a/src/reference/asciidoc/whats-new.adoc +++ b/src/reference/asciidoc/whats-new.adoc @@ -179,6 +179,11 @@ Also the `ConnectionBlockedEvent` and `ConnectionUnblockedEvent` events are emit See <<connections>> for more information. +===== Connection Factory Bean Changes + +The `RabbitConnectionFactoryBean` now provides an `enableHostnameVerification` property; set it to `true` to enable host name verification. +Host name verification requires overriding the `amqp-client` to 5.4.0 or later. + ==== Earlier Releases See <<previous-whats-new>> for changes in previous versions.
1
9df92dd188f27f5ad6e56b50323b7556ad898b03
https://github.com/star7th/showdoc/commit/9df92dd188f27f5ad6e56b50323b7556ad898b03
bug of import
diff --git a/server/Application/Api/Controller/ImportSwaggerController.class.php b/server/Application/Api/Controller/ImportSwaggerController.class.php index 81af9e50..92dc1b1f 100644 --- a/server/Application/Api/Controller/ImportSwaggerController.class.php +++ b/server/Application/Api/Controller/ImportSwaggerController.class.php @@ -57,9 +57,11 @@ private function _getAllTagsLogs($json_array) { foreach ($value as $method => $value2) { $tags = isset($value2["tags"]) ? $value2["tags"] : array(); if ($tags == array()){ - $pages = $this->_requestToDoc($method, $url, $value2, $json_array); - $catalogsMap["fromSwagger"]["pages"][] = $pages; - }else{ + $page = $this->_requestToDoc($method, $url, $value2, $json_array); + if($page['page_title']){ + $catalogsMap["fromSwagger"]["pages"][] = $page; + } + }else{ foreach ($tags as $tag){ if (!key_exists($tag, $catalogsMap)) { $page = $this->_requestToDoc($method, $url, $value2, $json_array); @@ -103,7 +105,7 @@ private function _requestToDoc($method , $url , $request , $json_array){ //如果是来自runapi的导入请求,则已经return不再执行下面 } $return = array() ; - $return['page_title'] = $request['summary'] ; + $return['page_title'] = $request['summary'] ? $request['summary']: $request['operationId'] ; $return['s_number'] = 99 ; $return['page_comments'] = '' ; @@ -203,7 +205,7 @@ private function _requestToDoc($method , $url , $request , $json_array){ private function _requestToApi($method , $url , $request , $json_array){ $return = array() ; - $return['page_title'] = $request['summary'] ; + $return['page_title'] = $request['summary'] ? $request['summary']: $request['operationId'] ; $return['s_number'] = 99 ; $return['page_comments'] = '' ; @@ -211,7 +213,7 @@ private function _requestToApi($method , $url , $request , $json_array){ "info"=>array( "from" => 'runapi' , "type" => 'api' , - "title" => $request['summary'] , + "title" => $request['summary'] ? $request['summary']: $request['operationId'] , "description" => $request['description'] , "method" => strtolower($method) , "url" => $url ,
0
d56887f7c5531587e929bfcf4a26d6d34da10699
https://github.com/symfony/symfony/commit/d56887f7c5531587e929bfcf4a26d6d34da10699
bug #40042 [Doctrine] Restore priority for EventSubscribers (jderusse) This PR was merged into the 4.4 branch. Discussion ---------- [Doctrine] Restore priority for EventSubscribers | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | fix #40031 | License | MIT | Doc PR | - Since #39990, lazy subscribers are called AFTER listeners (which is the opposite of previous implementation). This PR restore the previous behavior. Note: ordered subscribers is implemented in #39978 but is considered as a new feature. Commits ------- 94eac1b83f Restore priority for eventSubscribers
diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index 8415ee14b63c..9b3c1595a41f 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -164,11 +164,22 @@ private function initializeListeners(string $eventName) private function initializeSubscribers() { $this->initializedSubscribers = true; + + $eventListeners = $this->listeners; + // reset eventListener to respect priority: EventSubscribers have a higher priority + $this->listeners = []; foreach ($this->subscribers as $id => $subscriber) { if (\is_string($subscriber)) { parent::addEventSubscriber($this->subscribers[$id] = $this->container->get($subscriber)); } } + foreach ($eventListeners as $event => $listeners) { + if (!isset($this->listeners[$event])) { + $this->listeners[$event] = []; + } + $this->listeners[$event] += $listeners; + } + $this->subscribers = []; } /** diff --git a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php index 01baa46dc93d..e9d260ec2660 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php @@ -146,11 +146,14 @@ public function testAddEventListenerAndSubscriberAfterDispatchEvent() public function testGetListenersForEvent() { + $this->evm = new ContainerAwareEventManager($this->container, ['lazy2']); + $this->container->set('lazy', $listener1 = new MyListener()); + $this->container->set('lazy2', $subscriber1 = new MySubscriber(['foo'])); $this->evm->addEventListener('foo', 'lazy'); $this->evm->addEventListener('foo', $listener2 = new MyListener()); - $this->assertSame([$listener1, $listener2], array_values($this->evm->getListeners('foo'))); + $this->assertSame([$subscriber1, $listener1, $listener2], array_values($this->evm->getListeners('foo'))); } public function testGetListeners()
0
4bd996d0d85afc3948926d4d9f144986be1a8f97
https://github.com/univention/univention-corporate-server/commit/4bd996d0d85afc3948926d4d9f144986be1a8f97
Bug #52693,Bug #52696: univention-ldap ANNOUNCE
diff --git a/doc/errata/staging/univention-ldap.yaml b/doc/errata/published/2021-02-03_885_univention-ldap.yaml similarity index 91% rename from doc/errata/staging/univention-ldap.yaml rename to doc/errata/published/2021-02-03_885_univention-ldap.yaml index 0854111d60..2c5fe27bc9 100644 --- a/doc/errata/staging/univention-ldap.yaml +++ b/doc/errata/published/2021-02-03_885_univention-ldap.yaml @@ -11,3 +11,5 @@ desc: | * From now on sha-512 hashes are used for the LDAP service accounts `admin` and `backup`. bug: [52693, 52696] +erratum: 885 +announced: 2021-02-03
0
1190ba6a3605b243ed6be71becda99b8638b7921
https://github.com/ibus/ibus-anthy/commit/1190ba6a3605b243ed6be71becda99b8638b7921
Updated emoji dictionary for emoji 12.0 https://unicode.org/emoji/charts-12.0/emoji-released.html
diff --git a/data/emoji-each.t b/data/emoji-each.t index 0f00146..6b3f187 100644 --- a/data/emoji-each.t +++ b/data/emoji-each.t @@ -2,8 +2,8 @@ # # ibus-anthy - The Anthy engine for IBus # -# Copyright (c) 2015-2018 Takao Fujiwara <[email protected]> -# Copyright (c) 2015-2018 Red Hat, Inc. +# Copyright (c) 2015-2019 Takao Fujiwara <[email protected]> +# Copyright (c) 2015-2019 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,10 +35,14 @@ あかちゃん #T35*500 👶 あかちゃん #T35*500 👼 あかちゃん #T35*500 🤱 +あかり #T35*500 🪔 あかんぼう #T35*500 👶 あかんぼう #T35*500 👼 あかんぼう #T35*500 🤱 あくしゅ #T35*500 🤝 +あくしゅ #T35*500 👭 +あくしゅ #T35*500 👫 +あくしゅ #T35*500 👬 あし #T35*500 🦵 あし #T35*500 🦶 あしあと #T35*500 👣 @@ -97,6 +101,9 @@ いけい #T35*500 ︎ いけい #T35*500 ️ いしやきいも #T35*500 🍠 +いす #T35*500 🦼 +いす #T35*500 🦽 +いす #T35*500 🪑 いせえび #T35*500 🦞 いせき #T35*500 ⛬ いちい #T35*500 🥇 @@ -111,6 +118,8 @@ いぬ #T35*500 🐕 いぬ #T35*500 🐩 いぬ #T35*500 🐶 +いぬ #T35*500 🦮 +いぬ #T35*500 🦺 いね #T35*500 🌾 いのしし #T35*500 🐗 いのり #T35*500 🤞 @@ -184,6 +193,11 @@ えびふらい #T35*500 🍤 えむでぃー #T35*500 💽 #@EMOJI_EMOJI@ +えん #T35*500 🟠 +えん #T35*500 🟡 +えん #T35*500 🟢 +えん #T35*500 🟣 +えん #T35*500 🟤 えんそく #T35*500 🧺 えんばんなげ #T35*500 🥏 えんぴつ #T35*500 ✎ @@ -236,6 +250,7 @@ おじぎ #T35*500 🙇 おたく #T35*500 🤓 おちば #T35*500 🍂 +おちゃ #T35*500 🧉 おっけい #T35*500 🙆 おっけい #T35*500 👌 おっけー #T35*500 🙆 @@ -254,9 +269,10 @@ おとな #T35*500 🧑 おとな #T35*500 🧓 おとめざ #T35*500 ♍ -おねがい #T35*500 🥺 おに #T35*500 👹 おにぎり #T35*500 🍙 +おねがい #T35*500 🥺 +おの #T35*500 🪓 おばあさん #T35*500 👵 おばあちゃん #T35*500 👵 おばけ #T35*500 👻 @@ -266,8 +282,11 @@ おふぃす #T35*500 🏢 おまもり #T35*500 🧿 おもちゃ #T35*500 🧸 +おもちゃ #T35*500 🪀 +おもちゃ #T35*500 🪁 おやゆび #T35*500 👍 おやゆび #T35*500 👎 +おらうーたん #T35*500 🦧 おれんじ #T35*500 🍊 おんがく #T35*500 🎘 おんがく #T35*500 🎹 @@ -289,6 +308,7 @@ おーけー #T35*500 👌 か #T35*500 🦟 かい #T35*500 🐚 +かい #T35*500 🦪 かいおうせい #T35*500 ♆ かいもの #T35*500 🛒 かいわ #T35*500 ⚞ @@ -426,6 +446,7 @@ かお #T35*500 🥵 かお #T35*500 🥶 かお #T35*500 🥺 +かお #T35*500 🥱 かお #T35*500 🤴 かお #T35*500 👸 かお #T35*500 🤶 @@ -559,6 +580,7 @@ かおもじ #T35*500 🥵 かおもじ #T35*500 🥶 かおもじ #T35*500 🥺 +かおもじ #T35*500 🥱 かおもじ #T35*500 🤴 かおもじ #T35*500 👸 かおもじ #T35*500 🤶 @@ -566,6 +588,7 @@ かがく #T35*500 🧪 かがく #T35*500 🧫 かがく #T35*500 🧬 +かき #T35*500 🦪 かきごおり #T35*500 🍧 かく #T35*500 ✍ かくてる #T35*500 🍸 @@ -593,6 +616,7 @@ かみ #T35*500 🦱 かみ #T35*500 🦲 かみ #T35*500 🦳 +かみそり #T35*500 🪒 かみなり #T35*500 ⚡ かめ #T35*500 🐢 かめら #T35*500 📷 @@ -609,6 +633,7 @@ からー #T35*500 ️ かれる #T35*500 🥀 かれー #T35*500 🍛 +かわうそ #T35*500 🦦 かん #T35*500 🥫 かんがえちゅう #T35*500 😔 かんがえちゅう #T35*500 💭 @@ -642,6 +667,7 @@ がっき #T35*500 🎺 がっき #T35*500 🎸 がっき #T35*500 🎷 +がっき #T35*500 🪕 がっこう #T35*500 🏫 がっこう #T35*500 🎒 がっこう #T35*500 🎓 @@ -692,6 +718,7 @@ きら #T35*500 ✰ きり #T35*500 🌁 きり #T35*500 🌫 +きりつ #T35*500 🧍 きん #T35*500 🥇 きんぎょ #T35*500 🐠 きんこ #T35*500 🧰 @@ -746,6 +773,7 @@ くつ #T35*500 👢 くつ #T35*500 🥾 くつ #T35*500 🥿 +くつ #T35*500 🩰 くつ #T35*500 👣 くつした #T35*500 🧦 くま #T35*500 🐻 @@ -762,6 +790,9 @@ くりすます #T35*500 🤶 くりっぷ #T35*500 📎 くるま #T35*500 🏎 +くるま #T35*500 🛺 +くるまいす #T35*500 🦼 +くるまいす #T35*500 🦽 くろうす #T35*500 🤶 くろわっさん #T35*500 🥐 くろーばー #T35*500 ☘ @@ -778,6 +809,7 @@ ぐー #T35*500 🤜 けいこく #T35*500 ⚠ けいさつ #T35*500 👮 +けいさつけん #T35*500 🦺 けいさん #T35*500 🧮 けいたい #T35*500 📱 けいたい #T35*500 📲 @@ -835,6 +867,7 @@ こうじょう #T35*500 ⛭ こうじょう #T35*500 🏭 こうもり #T35*500 🦇 +こおり #T35*500 🧊 こおろぎ #T35*500 🦗 ここなっつ #T35*500 🥥 こしょう #T35*500 🧂 @@ -858,6 +891,7 @@ こども #T35*500 🤱 こどものひ #T35*500 🎏 こびと #T35*500 🧝 +ころっけ #T35*500 🧆 こんぱす #T35*500 🧭 こんぴゅーたー #T35*500 💻 こんぴゅーたー #T35*500 🖥 @@ -916,6 +950,7 @@ さめ #T35*500 🦈 さようなら #T35*500 👋 さらだ #T35*500 🥗 +さりー #T35*500 🥻 さる #T35*500 🐒 さる #T35*500 🐵 さんい #T35*500 🥉 @@ -932,14 +967,27 @@ しお #T35*500 🧂 しおり #T35*500 📑 しか #T35*500 🦌 +しかく #T35*500 🟥 +しかく #T35*500 🟦 +しかく #T35*500 🟧 +しかく #T35*500 🟨 +しかく #T35*500 🟩 +しかく #T35*500 🟪 +しかく #T35*500 🟫 しけん #T35*500 📝 しけんかん #T35*500 🧪 ししざ #T35*500 ♌ しずか #T35*500 🤫 +しせい #T35*500 🧍 +しせい #T35*500 🧎 した #T35*500 👅 した #T35*500 😛 した #T35*500 😜 した #T35*500 😝 +したぎ #T35*500 👙 +したぎ #T35*500 🩱 +したぎ #T35*500 🩲 +したぎ #T35*500 🩳 しまうま #T35*500 🦓 しゃつ #T35*500 👕 しゃんぱん #T35*500 🥂 @@ -960,6 +1008,13 @@ しゅうしょくし #T35*500 ️ しょうおん #T35*500 🔇 しょうかき #T35*500 🧯 +しょうがいしゃ #T35*500 🦻 +しょうがいしゃ #T35*500 🦾 +しょうがいしゃ #T35*500 🦿 +しょうがいしゃ #T35*500 🧏 +しょうがいしゃ #T35*500 🦼 +しょうがいしゃ #T35*500 🦽 +しょうがいしゃ #T35*500 🦯 しょうがくせい #T35*500 🎒 しょうがくせい #T35*500 🎓 しょうがつ #T35*500 🎍 @@ -1031,9 +1086,11 @@ じゅーす #T35*500 🍹 じゅーす #T35*500 🥤 じゅーす #T35*500 🥫 +じゅーす #T35*500 🧃 じんじゃ #T35*500 ⛩ じーんず #T35*500 👖 すいえい #T35*500 🏊 +すいえい #T35*500 🤿 すいか #T35*500 🍉 すいきゅう #T35*500 🤽 すいしょう #T35*500 🔮 @@ -1055,10 +1112,13 @@ すいーつ #T35*500 🥮 すいーつ #T35*500 🥯 すいーつ #T35*500 🧁 +すいーつ #T35*500 🧇 +すかんく #T35*500 🦨 すかーふ #T35*500 🧣 すかーふ #T35*500 🧕 すきー #T35*500 ⛷ すきー #T35*500 🎿 +すくない #T35*500 🤏 すくめる #T35*500 🤷 すくーたー #T35*500 🛴 すくーたー #T35*500 🛵 @@ -1120,6 +1180,8 @@ すぽーつ #T35*500 🥎 すぽーつ #T35*500 🥏 すぽーつ #T35*500 🥍 +すぽーつ #T35*500 🪂 +すぽーつ #T35*500 🤿 すまいる #T35*500 ☺ すまいる #T35*500 ☻ すまいる #T35*500 😀 @@ -1145,6 +1207,7 @@ すまいる #T35*500 🙋 すまいる #T35*500 ʬ すろっと #T35*500 🎰 +すわる #T35*500 🧎 すーつけーす #T35*500 🧳 すーぱーうーまん #T35*500 🦹 すーぱーまん #T35*500 🦸 @@ -1166,6 +1229,7 @@ せいざ #T35*500 ♑ せいざ #T35*500 ♒ せいざ #T35*500 ♓ +せいざ #T35*500 🧎 せいじん #T35*500 👨 せいじん #T35*500 👩 せいじん #T35*500 🧑 @@ -1204,7 +1268,9 @@ たか #T35*500 🦅 たきしーど #T35*500 🤵 たこ #T35*500 🐙 +たこあげ #T35*500 🪁 たこす #T35*500 🌮 +たつ #T35*500 🧍 たてもの #T35*500 🏠 たてもの #T35*500 🏡 たてもの #T35*500 🏢 @@ -1215,12 +1281,14 @@ たてもの #T35*500 🏫 たてもの #T35*500 ⛭ たてもの #T35*500 🏭 +たてもの #T35*500 🛕 たなばた #T35*500 🎋 たのむ #T35*500 🥺 たべもの #T35*500 🍔 たべもの #T35*500 🍕 たべもの #T35*500 🍖 たべもの #T35*500 🍗 +たべもの #T35*500 🦪 たべもの #T35*500 🍘 たべもの #T35*500 🍙 たべもの #T35*500 🍚 @@ -1253,6 +1321,7 @@ たべもの #T35*500 🍮 たべもの #T35*500 🍯 たべもの #T35*500 🍰 +たべもの #T35*500 🧇 たべもの #T35*500 🍱 たべもの #T35*500 🍲 たべもの #T35*500 🥘 @@ -1286,15 +1355,20 @@ たべもの #T35*500 🥩 たべもの #T35*500 🥪 たべもの #T35*500 🥫 +たべもの #T35*500 🧆 たべもの #T35*500 🥬 +たべもの #T35*500 🧄 +たべもの #T35*500 🧅 たべもの #T35*500 🥭 たべもの #T35*500 🥮 たべもの #T35*500 🥯 たべもの #T35*500 🧁 たべもの #T35*500 🧂 +たべもの #T35*500 🧈 たまご #T35*500 🥚 たまご #T35*500 🍳 たましい #T35*500 🧞 +たまねぎ #T35*500 🧅 たんさん #T35*500 🥤 たんざく #T35*500 🎋 たんじょうび #T35*500 🎂 @@ -1302,6 +1376,7 @@ たんぶらー #T35*500 🥃 たーばん #T35*500 👳 だいあもんど #T35*500 💎 +だいびんぐ #T35*500 🤿 だいやもんど #T35*500 💎 だっこ #T35*500 🤱 だっしゅ #T35*500 💨 @@ -1314,6 +1389,7 @@ だんす #T35*500 🕺 だーつ #T35*500 ◎ だーつ #T35*500 🎯 +ち #T35*500 🩸 ちきゅう #T35*500 ♁ ちきゅう #T35*500 🌍 ちきゅう #T35*500 🌎 @@ -1321,6 +1397,7 @@ ちきゅう #T35*500 🌐 ちけっと #T35*500 🎫 ちけっと #T35*500 🎟 +ちゃくせき #T35*500 🧎 ちゃっく #T35*500 🤐 ちゅうけい #T35*500 📡 ちゅうごく #T35*500 👲 @@ -1328,17 +1405,25 @@ ちゅうせい #T35*500 ⚲ ちゅーりっぷ #T35*500 🌷 ちょう #T35*500 🦋 +ちょうかく #T35*500 🧏 +ちょうかくしょうがい #T35*500 🧏 ちょうしょく #T35*500 🥣 +ちょうしんき #T35*500 🩺 ちょうみりょう #T35*500 🧂 +ちょくりつ #T35*500 🧍 ちょき #T35*500 ✌ ちょこれーと #T35*500 🍫 ちんげんさい #T35*500 🥬 ちーず #T35*500 🧀 つえ #T35*500 ☤ +つえ #T35*500 🦯 つかれる #T35*500 😫 +つかれる #T35*500 🥱 つきみ #T35*500 🎑 +つねる #T35*500 🤏 つの #T35*500 👿 つの #T35*500 😈 +つまむ #T35*500 🤏 つり #T35*500 🎣 て #T35*500 ✊ て #T35*500 ✋ @@ -1357,6 +1442,11 @@ て #T35*500 🤟 て #T35*500 🤟 て #T35*500 🤲 +て #T35*500 🤏 +て #T35*500 🤝 +て #T35*500 👭 +て #T35*500 👫 +て #T35*500 👬 ていくあうと #T35*500 🥡 てがき #T35*500 ✍ てがみ #T35*500 💌 @@ -1366,6 +1456,7 @@ てにす #T35*500 🎾 てのひら #T35*500 👐 てぶくろ #T35*500 🧤 +てら #T35*500 🛕 てれび #T35*500 📺 てんぐ #T35*500 👺 てんぐ #T35*500 🤥 @@ -1449,11 +1540,14 @@ どうぶつ #T35*500 🐓 どうぶつ #T35*500 🐔 どうぶつ #T35*500 🐕 +どうぶつ #T35*500 🦮 +どうぶつ #T35*500 🦺 どうぶつ #T35*500 🐖 どうぶつ #T35*500 🐗 どうぶつ #T35*500 🐘 どうぶつ #T35*500 🐙 どうぶつ #T35*500 🐚 +どうぶつ #T35*500 🦪 どうぶつ #T35*500 🐛 どうぶつ #T35*500 🐜 どうぶつ #T35*500 🐝 @@ -1520,16 +1614,23 @@ どうぶつ #T35*500 🦡 どうぶつ #T35*500 🦢 どうぶつ #T35*500 🧸 +どうぶつ #T35*500 🦥 +どうぶつ #T35*500 🦦 +どうぶつ #T35*500 🦧 +どうぶつ #T35*500 🦨 +どうぶつ #T35*500 🦩 どかた #T35*500 👷 どくろ #T35*500 💀 どくろ #T35*500 ☠ どげざ #T35*500 🙏 どせい #T35*500 ♄ +どせい #T35*500 🪐 どらきゅら #T35*500 🧛 どらごん #T35*500 🐉 どらごん #T35*500 🐲 どらむ #T35*500 🥁 どれす #T35*500 👗 +どれす #T35*500 🥻 どれす #T35*500 👰 どんぶり #T35*500 🍜 どんぶり #T35*500 🥣 @@ -1545,12 +1646,14 @@ なふだ #T35*500 📛 なべ #T35*500 🍲 なべ #T35*500 🥘 +なまけもの #T35*500 🦥 なみ #T35*500 🌊 なると #T35*500 🍥 にい #T35*500 🥈 にく #T35*500 🍖 にく #T35*500 🍗 にく #T35*500 🥩 +にくだんご #T35*500 🧆 にじ #T35*500 🌈 にひる #T35*500 😏 にひる #T35*500 😼 @@ -1564,6 +1667,7 @@ にんぎょう #T35*500 🎎 にんしん #T35*500 🤰 にんじん #T35*500 🥕 +にんにく #T35*500 🧄 ぬいぐるみ #T35*500 🧸 ねいる #T35*500 💅 ねがい #T35*500 🥺 @@ -1577,6 +1681,7 @@ ねっと #T35*500 🥅 ねつ #T35*500 🤒 ねむい #T35*500 😪 +ねむい #T35*500 🥱 ねる #T35*500 💤 ねる #T35*500 😴 のう #T35*500 🧠 @@ -1595,6 +1700,9 @@ のみもの #T35*500 🥛 のみもの #T35*500 🥤 のみもの #T35*500 🥫 +のみもの #T35*500 🧃 +のみもの #T35*500 🧉 +のみもの #T35*500 🧊 は #T35*500 ☘ は #T35*500 🍀 は #T35*500 ஐ @@ -1680,6 +1788,8 @@ はーと #T35*500 💛 はーと #T35*500 💜 はーと #T35*500 🧡 +はーと #T35*500 🤍 +はーと #T35*500 🤎 はーと #T35*500 💝 はーと #T35*500 💞 はーと #T35*500 💟 @@ -1700,17 +1810,22 @@ ばけっと #T35*500 🥖 ばすけっと #T35*500 🧺 ばすけっとぼーる #T35*500 🏀 +ばたー #T35*500 🧈 ばっぐ #T35*500 👜 ばった #T35*500 🦗 ばってりー #T35*500 🔋 ばなな #T35*500 🍌 ばら #T35*500 🌹 +ばれー #T35*500 🩰 ばんざい #T35*500 🙌 +ばんじょー #T35*500 🪕 +ばんそうこう #T35*500 🩹 ぱい #T35*500 🥧 ぱいなっぷる #T35*500 🍍 ぱすた #T35*500 🍝 ぱずる #T35*500 🧩 ぱそこん #T35*500 💻 +ぱらしゅーと #T35*500 🪂 ぱらそる #T35*500 ⛱ ぱれっと #T35*500 🎨 ぱん #T35*500 🍞 @@ -1739,7 +1854,9 @@ ぱーてぃ #T35*500 🥂 ぱーてぃ #T35*500 🥳 ひ #T35*500 🔥 +ひ #T35*500 🪔 ひげ #T35*500 🧔 +ひげそり #T35*500 🪒 ひこうき #T35*500 ✈ ひつぎ #T35*500 ⚰ ひつじ #T35*500 🐏 @@ -1824,6 +1941,7 @@ ぴーなっつ #T35*500 🥜 ふぁすなー #T35*500 🤐 ふぁっくす #T35*500 📠 +ふぁらふぇる #T35*500 🧆 ふぃぎあ #T35*500 ⛸ ふぃるむ #T35*500 🎞 ふぃるむ #T35*500 🎥 @@ -1841,6 +1959,9 @@ ふく #T35*500 👔 ふく #T35*500 👕 ふく #T35*500 👙 +ふく #T35*500 🩱 +ふく #T35*500 🩲 +ふく #T35*500 🩳 ふく #T35*500 👚 ふく #T35*500 👗 ふく #T35*500 👘 @@ -1849,6 +1970,8 @@ ふく #T35*500 🧤 ふく #T35*500 🧥 ふく #T35*500 🥼 +ふく #T35*500 🦺 +ふく #T35*500 🥻 ふく #T35*500 👖 ふく #T35*500 🧦 ふく #T35*500 👞 @@ -1858,6 +1981,7 @@ ふく #T35*500 👢 ふく #T35*500 🥾 ふく #T35*500 🥿 +ふく #T35*500 🩰 ふく #T35*500 🤵 ふく #T35*500 👰 ふくざつ #T35*500 😕 @@ -1873,6 +1997,7 @@ ふらいぱん #T35*500 🍳 ふらふら #T35*500 😵 ふらふら #T35*500 💫 +ふらみんご #T35*500 🦩 ふらんすぱん #T35*500 🥖 ふるーつ #T35*500 🍇 ふるーつ #T35*500 🍈 @@ -1926,6 +2051,7 @@ へっどほん #T35*500 🎧 へび #T35*500 🐍 へんがお #T35*500 🤪 +べすと #T35*500 🦺 べる #T35*500 🔔 べる #T35*500 🕭 べろ #T35*500 😛 @@ -1965,6 +2091,11 @@ ほし #T35*500 🌟 ほし #T35*500 🌠 ほし #T35*500 🤩 +ほし #T35*500 🪐 +ほじょき #T35*500 🦻 +ほじょき #T35*500 🦾 +ほじょき #T35*500 🦿 +ほちょうき #T35*500 🦻 ほっとけーき #T35*500 🥞 ほっとどっく #T35*500 🌭 ほてる #T35*500 🏨 @@ -1986,6 +2117,7 @@ ぼうし #T35*500 👒 ぼうし #T35*500 🧢 ぼうず #T35*500 🦲 +ぼうだんちょっき #T35*500 🦺 ぼくしんぐ #T35*500 🥊 ぼーと #T35*500 ⛵ ぼーと #T35*500 🛶 @@ -2009,12 +2141,19 @@ まきもの #T35*500 📜 ますく #T35*500 😷 ますく #T35*500 🎭 +まつばづえ #T35*500 🦯 まっさーじ #T35*500 💆 まっしゅるーむ #T35*500 🍄 +まて #T35*500 🧉 まにあ #T35*500 🤓 まにきゅあ #T35*500 💅 まほう #T35*500 🧙 まほう #T35*500 🧿 +まる #T35*500 🟠 +まる #T35*500 🟡 +まる #T35*500 🟢 +まる #T35*500 🟣 +まる #T35*500 🟤 まんげつ #T35*500 ○ まんげつ #T35*500 🌕 まんげつ #T35*500 🌝 @@ -2031,8 +2170,14 @@ みざる #T35*500 🙈 みずがめざ #T35*500 ♒ みずぎ #T35*500 👙 +みずぎ #T35*500 🩱 +みずぎ #T35*500 🩲 +みずぎ #T35*500 🩳 みつばち #T35*500 🐝 みみ #T35*500 👂 +みみ #T35*500 🦻 +みみ #T35*500 🧏 +みーとぼーる #T35*500 🧆 むげん #T35*500 ♾ むし #T35*500 🐛 むし #T35*500 🦗 @@ -2056,7 +2201,9 @@ めーる #T35*500 ✉ めーる #T35*500 📧 めーる #T35*500 📨 +もうどうけん #T35*500 🦮 もくせい #T35*500 ♃ +もぐる #T35*500 🤿 もち #T35*500 🍘 もちかえり #T35*500 🥡 もも #T35*500 🍑 @@ -2078,6 +2225,8 @@ やさい #T35*500 🥜 やさい #T35*500 🥦 やさい #T35*500 🥬 +やさい #T35*500 🧄 +やさい #T35*500 🧅 やし #T35*500 🌴 やし #T35*500 🥥 やま #T35*500 ⛰ @@ -2110,6 +2259,7 @@ よだれ #T35*500 🤤 よち #T35*500 🥠 よっぱらい #T35*500 🥴 +よーよー #T35*500 🪀 らくだ #T35*500 🐪 らくだ #T35*500 🐫 らくろす #T35*500 🥍 @@ -2117,11 +2267,13 @@ らざにあ #T35*500 🥧 らじお #T35*500 📻 らっかせい #T35*500 🥜 +らっこ #T35*500 🦦 らっと #T35*500 🐀 らっぷとっぷ #T35*500 💻 らぶれたー #T35*500 💌 らま #T35*500 🦙 らんどせる #T35*500 🎒 +らんぷ #T35*500 🪔 らーめん #T35*500 🍜 りきゅーる #T35*500 🥃 りくじょう #T35*500 🏃 @@ -2148,6 +2300,8 @@ ろっく #T35*500 🔒 ろっく #T35*500 🔓 ろぼっと #T35*500 🤖 +ろぼっと #T35*500 🦾 +ろぼっと #T35*500 🦿 ろーしょん #T35*500 🧴 ろーすとびーふ #T35*500 🥩 わいん #T35*500 🍷 @@ -2162,6 +2316,9 @@ わくせい #T35*500 ♅ わくせい #T35*500 ♆ わくせい #T35*500 ♇ +わくせい #T35*500 🪐 +わずか #T35*500 🤏 +わっふる #T35*500 🧇 わに #T35*500 🐊 わらい #T35*500 ☺ わらい #T35*500 ☻ diff --git a/data/emoji-emoji.t b/data/emoji-emoji.t index 875af7e..2ad860f 100644 --- a/data/emoji-emoji.t +++ b/data/emoji-emoji.t @@ -2,8 +2,8 @@ # # ibus-anthy - The Anthy engine for IBus # -# Copyright (c) 2015-2018 Takao Fujiwara <[email protected]> -# Copyright (c) 2015-2018 Red Hat, Inc. +# Copyright (c) 2015-2019 Takao Fujiwara <[email protected]> +# Copyright (c) 2015-2019 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -46,6 +46,7 @@ えもじ #T35*500 ♅ えもじ #T35*500 ♆ えもじ #T35*500 ♇ +えもじ #T35*500 🪐 えもじ #T35*500 ♈ えもじ #T35*500 ♉ えもじ #T35*500 ♊ @@ -269,15 +270,20 @@ えもじ #T35*500 🍮 えもじ #T35*500 🍯 えもじ #T35*500 🍰 +えもじ #T35*500 🧇 えもじ #T35*500 🥠 えもじ #T35*500 🥧 えもじ #T35*500 🥨 +えもじ #T35*500 🧆 えもじ #T35*500 🥬 +えもじ #T35*500 🧄 +えもじ #T35*500 🧅 えもじ #T35*500 🥭 えもじ #T35*500 🥮 えもじ #T35*500 🥯 えもじ #T35*500 🧁 えもじ #T35*500 🧂 +えもじ #T35*500 🧈 えもじ #T35*500 🍱 えもじ #T35*500 🥡 えもじ #T35*500 🥣 @@ -301,6 +307,9 @@ えもじ #T35*500 🥃 えもじ #T35*500 🥛 えもじ #T35*500 🥫 +えもじ #T35*500 🧃 +えもじ #T35*500 🧉 +えもじ #T35*500 🧊 えもじ #T35*500 🎀 えもじ #T35*500 🎁 えもじ #T35*500 📦 @@ -351,6 +360,8 @@ えもじ #T35*500 🧿 えもじ #T35*500 🧩 えもじ #T35*500 🧸 +えもじ #T35*500 🪀 +えもじ #T35*500 🪁 えもじ #T35*500 ♟ えもじ #T35*500 🎹 えもじ #T35*500 🎙 @@ -363,6 +374,7 @@ えもじ #T35*500 🎺 えもじ #T35*500 🎻 えもじ #T35*500 🎼 +えもじ #T35*500 🪕 えもじ #T35*500 🎾 えもじ #T35*500 ⛷ えもじ #T35*500 🎿 @@ -392,6 +404,7 @@ えもじ #T35*500 🛴 えもじ #T35*500 🛵 えもじ #T35*500 🏎 +えもじ #T35*500 🛺 えもじ #T35*500 🤸 えもじ #T35*500 🤹 えもじ #T35*500 🤺 @@ -406,6 +419,8 @@ えもじ #T35*500 🛹 えもじ #T35*500 🥏 えもじ #T35*500 🥍 +えもじ #T35*500 🪂 +えもじ #T35*500 🤿 えもじ #T35*500 🏠 えもじ #T35*500 🏡 えもじ #T35*500 🏢 @@ -416,6 +431,7 @@ えもじ #T35*500 🏫 えもじ #T35*500 ⛭ えもじ #T35*500 🏭 +えもじ #T35*500 🛕 えもじ #T35*500 🐀 えもじ #T35*500 🐁 えもじ #T35*500 🐂 @@ -438,11 +454,14 @@ えもじ #T35*500 🐓 えもじ #T35*500 🐔 えもじ #T35*500 🐕 +えもじ #T35*500 🦮 +えもじ #T35*500 🦺 えもじ #T35*500 🐖 えもじ #T35*500 🐗 えもじ #T35*500 🐘 えもじ #T35*500 🐙 えもじ #T35*500 🐚 +えもじ #T35*500 🦪 えもじ #T35*500 🐛 えもじ #T35*500 🐜 えもじ #T35*500 🐝 @@ -510,6 +529,11 @@ えもじ #T35*500 🦠 えもじ #T35*500 🦡 えもじ #T35*500 🦢 +えもじ #T35*500 🦥 +えもじ #T35*500 🦦 +えもじ #T35*500 🦧 +えもじ #T35*500 🦨 +えもじ #T35*500 🦩 えもじ #T35*500 👀 えもじ #T35*500 👁 えもじ #T35*500 👂 @@ -529,6 +553,7 @@ えもじ #T35*500 👐 えもじ #T35*500 🤟 えもじ #T35*500 🤲 +えもじ #T35*500 🤏 えもじ #T35*500 ♔ えもじ #T35*500 ♕ えもじ #T35*500 ♚ @@ -545,11 +570,16 @@ えもじ #T35*500 👗 えもじ #T35*500 👘 えもじ #T35*500 👙 +えもじ #T35*500 🩱 +えもじ #T35*500 🩲 +えもじ #T35*500 🩳 えもじ #T35*500 👚 えもじ #T35*500 🧣 えもじ #T35*500 🧤 えもじ #T35*500 🧥 えもじ #T35*500 🥼 +えもじ #T35*500 🦺 +えもじ #T35*500 🥻 えもじ #T35*500 🧦 えもじ #T35*500 👛 えもじ #T35*500 👜 @@ -561,6 +591,7 @@ えもじ #T35*500 👢 えもじ #T35*500 🥾 えもじ #T35*500 🥿 +えもじ #T35*500 🩰 えもじ #T35*500 👣 えもじ #T35*500 👤 えもじ #T35*500 👥 @@ -595,6 +626,15 @@ えもじ #T35*500 🚺 えもじ #T35*500 🚻 えもじ #T35*500 🚾 +えもじ #T35*500 🦻 +えもじ #T35*500 🦾 +えもじ #T35*500 🦿 +えもじ #T35*500 🧏 +えもじ #T35*500 🧍 +えもじ #T35*500 🧎 +えもじ #T35*500 🦼 +えもじ #T35*500 🦽 +えもじ #T35*500 🦯 えもじ #T35*500 🧖 えもじ #T35*500 🤴 えもじ #T35*500 👸 @@ -653,6 +693,8 @@ えもじ #T35*500 💛 えもじ #T35*500 💜 えもじ #T35*500 🧡 +えもじ #T35*500 🤍 +えもじ #T35*500 🤎 えもじ #T35*500 💝 えもじ #T35*500 💞 えもじ #T35*500 💟 @@ -717,6 +759,7 @@ えもじ #T35*500 🔓 えもじ #T35*500 🔖 えもじ #T35*500 🔥 +えもじ #T35*500 🪔 えもじ #T35*500 🔧 えもじ #T35*500 ⚒ えもじ #T35*500 ⛏ @@ -880,6 +923,7 @@ えもじ #T35*500 🥵 えもじ #T35*500 🥶 えもじ #T35*500 🥺 +えもじ #T35*500 🥱 えもじ #T35*500 🤰 えもじ #T35*500 🤵 えもじ #T35*500 🤶 @@ -914,6 +958,24 @@ えもじ #T35*500 🧽 えもじ #T35*500 🧯 えもじ #T35*500 ♾ +えもじ #T35*500 🪓 +えもじ #T35*500 🩸 +えもじ #T35*500 🩹 +えもじ #T35*500 🩺 +えもじ #T35*500 🪑 +えもじ #T35*500 🪒 +えもじ #T35*500 🟠 +えもじ #T35*500 🟡 +えもじ #T35*500 🟢 +えもじ #T35*500 🟣 +えもじ #T35*500 🟤 +えもじ #T35*500 🟥 +えもじ #T35*500 🟦 +えもじ #T35*500 🟧 +えもじ #T35*500 🟨 +えもじ #T35*500 🟩 +えもじ #T35*500 🟪 +えもじ #T35*500 🟫 えもじ #T35*500 🏻 えもじ #T35*500 🏼 えもじ #T35*500 🏽
0
db354df331bc3d3eb895521e0e977c9ad5131d63
https://github.com/dw/mitogen/commit/db354df331bc3d3eb895521e0e977c9ad5131d63
Merge branch 'master' into fix0.3.0naming
diff --git a/.ci/ansible_tests.py b/.ci/ansible_tests.py index c81f95390..b2aa31991 100755 --- a/.ci/ansible_tests.py +++ b/.ci/ansible_tests.py @@ -66,8 +66,6 @@ def pause_if_interactive(): run("sudo apt-get update") run("sudo apt-get install -y sshpass") - run("bash -c 'sudo ln -vfs /usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_nd.py /usr/lib/python2.7 || true'") - run("bash -c 'sudo ln -vfs /usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_nd.py $VIRTUAL_ENV/lib/python2.7 || true'") with ci_lib.Fold('ansible'): playbook = os.environ.get('PLAYBOOK', 'all.yml') diff --git a/README.md b/README.md index c7d8b03fb..85beacb48 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ ![](https://i.imgur.com/eBM6LhJ.gif) -[![Total alerts](https://img.shields.io/lgtm/alerts/g/dw/mitogen.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/dw/mitogen/alerts/) +[![Total alerts](https://img.shields.io/lgtm/alerts/g/mitogen-hq/mitogen.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/mitogen-hq/mitogen/alerts/) -[![Build Status](https://travis-ci.org/dw/mitogen.svg?branch=master)](https://travis-ci.org/dw/mitogen) +[![Build Status](https://api.travis-ci.com/mitogen-hq/mitogen.svg?branch=master)](https://api.travis-ci.com/mitogen-hq/mitogen) -[![Pipelines Status](https://dev.azure.com/dw-mitogen/Mitogen/_apis/build/status/dw.mitogen?branchName=master)](https://dev.azure.com/dw-mitogen/Mitogen/_build/latest?definitionId=1?branchName=master) +[![Pipelines Status](https://dev.azure.com/mitogen-hq/mitogen/_apis/build/status/mitogen-hq.mitogen?branchName=master)](https://dev.azure.com/mitogen-hq/mitogen/_build/latest?definitionId=1&branchName=master) diff --git a/tests/ansible/integration/playbook_semantics/delegate_to.yml b/tests/ansible/integration/playbook_semantics/delegate_to.yml index 4d4da028a..23b7168ce 100644 --- a/tests/ansible/integration/playbook_semantics/delegate_to.yml +++ b/tests/ansible/integration/playbook_semantics/delegate_to.yml @@ -51,10 +51,14 @@ shell: whoami > /tmp/delegate_to.yml.txt delegate_to: localhost become: true + tags: + - requires_local_sudo - name: "delegate_to, sudo" assert: that: "lookup('file', '/tmp/delegate_to.yml.txt') == 'root'" + tags: + - requires_local_sudo - name: "delegate_to, sudo" file: @@ -62,6 +66,8 @@ state: absent delegate_to: localhost become: true + tags: + - requires_local_sudo # @@ -71,10 +77,14 @@ shell: whoami > /tmp/delegate_to.yml.txt connection: local become: true + tags: + - requires_local_sudo - name: "connection:local, sudo" assert: that: "lookup('file', '/tmp/delegate_to.yml.txt') == 'root'" + tags: + - requires_local_sudo - name: "connection:local, sudo" file: @@ -82,3 +92,5 @@ state: absent connection: local become: true + tags: + - requires_local_sudo diff --git a/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml b/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml index 5de67ab99..8a8f00681 100644 --- a/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml +++ b/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml @@ -15,7 +15,7 @@ content: | #!/bin/bash export CUSTOM_INTERPRETER=1 - exec python2.7 "$@" + exec python "$@" - custom_python_detect_environment: vars: diff --git a/tox.ini b/tox.ini index 8a4ef3647..3227672fd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,44 +1,88 @@ +# This file is a local convenience. It is not a substitute for the full CI +# suite, and does not cover the full range of Python versions for Mitogen. + +# I use this on Ubuntu 20.04, with the following additions +# +# sudo add-apt-repository ppa:deadsnakes/ppa +# sudo apt update +# sudo apt install python3.5 python3.6 python3.7 python3.9 tox libsasl2-dev libldap2-dev libssl-dev ssh-pass + +# Last version to support each python version +# +# tox vir'env pip ansible coverage +# ========== ======== ======== ======== ======== ======== +# python2.4 1.4 1.8 1.1 ??? +# python2.5 1.6.1 1.9.1 1.3.1 ??? +# python2.6 2.9.1 15.2.0 9.0.3 2.6.20 4.5.4 + [tox] envlist = init, - py26, - py27, - py35, - py36, - py37, + py{27,36,39}-mode_ansible-ansible2.10, + py{27,36,39}-mode_mitogen, + py{27,36,39}-mode_mitogen-distro_centos7, report, +requires = + tox-factor [testenv] -usedevelop = True -deps = - -r{toxinidir}/dev_requirements.txt - -r{toxinidir}/tests/ansible/requirements.txt - +basepython = + py26: python2.6 + py27: python2.7 + py36: python3.6 + py37: python3.7 + py38: python3.8 + py39: python3.9 +commands_pre = + mode_ansible: {toxinidir}/.ci/ansible_install.py + mode_debops_common: {toxinidir}/.ci/debops_common_install.py + mode_mitogen: {toxinidir}/.ci/mitogen_install.py commands = - {posargs:bash run_tests} -whitelist_externals = - bash + mode_ansible: {toxinidir}/.ci/ansible_tests.py \ + --skip-tags requires_local_sudo + mode_debops_common: {toxinidir}/.ci/debops_common_tests.py + mode_mitogen: {toxinidir}/.ci/mitogen_tests.py +passenv = + HOME setenv = NOCOVERAGE_ERASE = 1 NOCOVERAGE_REPORT = 1 + ansible2.3: VER=2.3.3.0 + ansible2.4: VER=2.4.6.0 + ansible2.8: VER=2.8.3 + ansible2.9: VER=2.9.6 + ansible2.10: VER=2.10.0 + distro_centos5: DISTRO=centos5 + distro_centos6: DISTRO=centos6 + distro_centos7: DISTRO=centos7 + distro_debian: DISTRO=debian + distro_debianpy3: DISTRO=debian-py3 + distros_centos5: DISTROS=centos5 + distros_debian: DISTROS=debian + mode_ansible: MODE=ansible + mode_debops_common: MODE=debops_common + mode_mitogen: MODE=mitogen + strategy_linear: STRATEGY=linear [testenv:init] +basepython = python3 commands = coverage erase deps = - coverage + coverage==4.5.4 [testenv:report] +basepython = python3 commands = coverage html echo "coverage report is at file://{toxinidir}/htmlcov/index.html" deps = - coverage + coverage==4.5.4 whitelist_externals = echo [testenv:docs] -basepython = python +basepython = python3 changedir = docs commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
0
8436dbc562dd522085dfaed0eb6323ec5b799e5d
https://github.com/aquynh/capstone/commit/8436dbc562dd522085dfaed0eb6323ec5b799e5d
Fixed anon type in anon union error in m68k.h (#1597) Apple Clang 11.0.0 error: ``` capstone/include/capstone/m68k.h:160:3: error: anonymous types declared in an anonymous union are an extension [-Werror,-Wnested-anon-types] struct { ///< register pair in one operand ^ ```
diff --git a/include/capstone/m68k.h b/include/capstone/m68k.h index 76de25764a..41e23f3883 100644 --- a/include/capstone/m68k.h +++ b/include/capstone/m68k.h @@ -150,6 +150,12 @@ typedef struct m68k_op_br_disp { uint8_t disp_size; ///< Size from m68k_op_br_disp_size type above } m68k_op_br_disp; +/// Register pair in one operand. +typedef struct cs_m68k_op_reg_pair { + m68k_reg reg_0; + m68k_reg reg_1; +} cs_m68k_op_reg_pair; + /// Instruction operand typedef struct cs_m68k_op { union { @@ -157,10 +163,7 @@ typedef struct cs_m68k_op { double dimm; ///< double imm float simm; ///< float imm m68k_reg reg; ///< register value for REG operand - struct { ///< register pair in one operand - m68k_reg reg_0; - m68k_reg reg_1; - } reg_pair; + cs_m68k_op_reg_pair reg_pair; ///< register pair in one operand }; m68k_op_mem mem; ///< data when operand is targeting memory
0
a4d0fb1265f4ededdf6fd96f922c24238e0fc262
https://github.com/pingidentity/ldapsdk/commit/a4d0fb1265f4ededdf6fd96f922c24238e0fc262
Update the LDAP OID reference Updated the LDAP OID reference included in the documentation with a version that is generated from the OID registry. Also, added a test to help ensure that all OIDs referenced in constants in Java source files are contained in the OID registry.
diff --git a/docs/ldap-oid-reference.html b/docs/ldap-oid-reference.html index 18841370..22a5c2eb 100644 --- a/docs/ldap-oid-reference.html +++ b/docs/ldap-oid-reference.html @@ -19,1377 +19,1377 @@ <h2>LDAP OID Reference</h2> <tr> <td>0.9.2342.19200300.100.1.1</td> <td><tt>uid</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.2</td> <td><tt>textEncodedORAddress</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.3</td> <td><tt>mail</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.4</td> <td><tt>info</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.5</td> <td><tt>drink</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.6</td> <td><tt>roomNumber</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.7</td> <td><tt>photo</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.8</td> <td><tt>userClass</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.9</td> <td><tt>host</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.10</td> <td><tt>manager</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.11</td> <td><tt>documentIdentifier</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.12</td> <td><tt>documentTitle</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.13</td> <td><tt>documentVersion</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.14</td> <td><tt>documentAuthor</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.15</td> <td><tt>documentLocation</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.20</td> <td><tt>homePhone</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.21</td> <td><tt>secretary</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.22</td> <td><tt>otherMailbox</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.23</td> <td><tt>lastModifiedTime</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.24</td> <td><tt>lastModifiedBy</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.25</td> <td><tt>dc</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.26</td> <td><tt>aRecord</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.27</td> <td><tt>mDRecord</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.28</td> <td><tt>mxRecord</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.29</td> <td><tt>nSRecord</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.30</td> <td><tt>sOARecord</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.31</td> <td><tt>cNAMERecord</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.37</td> <td><tt>associatedDomain</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.38</td> <td><tt>associatedName</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.39</td> <td><tt>homePostalAddress</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.40</td> <td><tt>personalTitle</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.41</td> <td><tt>mobile</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.42</td> <td><tt>pager</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.43</td> <td><tt>co</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.44</td> <td><tt>uniqueIdentifier</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.45</td> <td><tt>organizationalStatus</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.46</td> <td><tt>janetMailbox</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.47</td> <td><tt>mailPreferenceOption</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.48</td> <td><tt>buildingName</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.49</td> <td><tt>dSAQuality</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.50</td> <td><tt>singleLevelQuality</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.51</td> <td><tt>subtreeMinimumQuality</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.52</td> <td><tt>subtreeMaximumQuality</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.53</td> <td><tt>personalSignature</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.54</td> <td><tt>dITRedirect</tt> Attribute Type</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.55</td> <td><tt>audio</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.56</td> <td><tt>documentPublisher</tt> Attribute Type</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.1.60</td> <td><tt>jpegPhoto</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.3</td> <td><tt>pilotObject</tt> Object Class</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.4</td> <td><tt>pilotPerson</tt> Object Class</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.5</td> <td><tt>account</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.6</td> <td><tt>document</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.7</td> <td><tt>room</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.9</td> <td><tt>documentSeries</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.13</td> <td><tt>domain</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.14</td> <td><tt>rFC822localPart</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.15</td> <td><tt>dNSDomain</tt> Object Class</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.17</td> <td><tt>domainRelatedObject</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.18</td> <td><tt>friendlyCountry</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.19</td> <td><tt>simpleSecurityObject</tt> Object Class</td> - <td><a href="specs/rfc4524.txt" target="_blank">RFC 4524</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4524.txt" target="_blank">RFC 4524</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.20</td> <td><tt>pilotOrganization</tt> Object Class</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.21</td> <td><tt>pilotDSA</tt> Object Class</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>0.9.2342.19200300.100.4.22</td> <td><tt>qualityLabelledData</tt> Object Class</td> - <td><a href="specs/rfc1274.txt" target="_blank">RFC 1274</a></td> + <td><a href="https://docs.ldap.com/specs/rfc1274.txt" target="_blank">RFC 1274</a></td> </tr> <tr> <td>1.2.826.0.1.3344810.2.3</td> <td>Matched Values Request Control</td> - <td><a href="specs/rfc3876.txt" target="_blank">RFC 3876</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3876.txt" target="_blank">RFC 3876</a></td> </tr> <tr> <td>1.2.826.0.1.3458854.2.1.1</td> <td><tt>groupOfEntries</tt> Object Class</td> - <td><a href="specs/draft-findlay-ldap-groupofentries-00.txt" target="_blank">draft-findlay-ldap-groupofentries</a></td> + <td><a href="https://docs.ldap.com/specs/draft-findlay-ldap-groupofentries-00.txt" target="_blank">draft-findlay-ldap-groupofentries</a></td> </tr> <tr> <td>1.2.840.113549.1.9.1</td> <td><tt>emailAddress</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.2</td> <td><tt>unstructuredName</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.3</td> <td><tt>contentType</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.4</td> <td><tt>messageDigest</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.5</td> <td><tt>signingTime</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.6</td> <td><tt>counterSignature</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.7</td> <td><tt>challengePassword</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.8</td> <td><tt>unstructuredAddress</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.24.1</td> <td><tt>pkcsEntity</tt> Object Class</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.24.2</td> <td><tt>naturalPerson</tt> Object Class</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.25.1</td> <td><tt>pKCS15Token</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.25.2</td> <td><tt>encryptedPrivateKeyInfo</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.1.9.25.5</td> <td><tt>pKCS7PDU</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.2.840.113549.6.0.0</td> <td>Signed Operation Request Control</td> - <td><a href="specs/rfc2649.txt" target="_blank">RFC 2649</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2649.txt" target="_blank">RFC 2649</a></td> </tr> <tr> <td>1.2.840.113549.6.0.1</td> <td>Demand Signed Result Request Control</td> - <td><a href="specs/rfc2649.txt" target="_blank">RFC 2649</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2649.txt" target="_blank">RFC 2649</a></td> </tr> <tr> <td>1.2.840.113549.6.0.2</td> <td>Signed Result Response Control</td> - <td><a href="specs/rfc2649.txt" target="_blank">RFC 2649</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2649.txt" target="_blank">RFC 2649</a></td> </tr> <tr> <td>1.2.840.113549.6.1.0</td> <td><tt>signedAuditTrail</tt> Object Class</td> - <td><a href="specs/rfc2649.txt" target="_blank">RFC 2649</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2649.txt" target="_blank">RFC 2649</a></td> </tr> <tr> <td>1.2.840.113549.6.1.2</td> <td><tt>zombieObject</tt> Object Class</td> - <td><a href="specs/rfc2649.txt" target="_blank">RFC 2649</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2649.txt" target="_blank">RFC 2649</a></td> </tr> <tr> <td>1.2.840.113549.6.2.0</td> <td><tt>Changes</tt> Attribute Type</td> - <td><a href="specs/rfc2649.txt" target="_blank">RFC 2649</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2649.txt" target="_blank">RFC 2649</a></td> </tr> <tr> <td>1.2.840.113549.6.2.1</td> <td><tt>OriginalObject</tt> Attribute Type</td> - <td><a href="specs/rfc2649.txt" target="_blank">RFC 2649</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2649.txt" target="_blank">RFC 2649</a></td> </tr> <tr> <td>1.2.840.113549.6.2.2</td> <td><tt>signedDirectoryOperationSupport</tt> Attribute Type</td> - <td><a href="specs/rfc2649.txt" target="_blank">RFC 2649</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2649.txt" target="_blank">RFC 2649</a></td> </tr> <tr> <td>1.2.840.113556.1.4.319</td> <td>Simple Paged Results Control</td> - <td><a href="specs/rfc2696.txt" target="_blank">RFC 2696</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2696.txt" target="_blank">RFC 2696</a></td> </tr> <tr> <td>1.2.840.113556.1.4.473</td> <td>Server-Side Sort Request Control</td> - <td><a href="specs/rfc2891.txt" target="_blank">RFC 2891</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2891.txt" target="_blank">RFC 2891</a></td> </tr> <tr> <td>1.2.840.113556.1.4.474</td> <td>Server-Side Sort Response Control</td> - <td><a href="specs/rfc2891.txt" target="_blank">RFC 2891</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2891.txt" target="_blank">RFC 2891</a></td> </tr> <tr> <td>1.2.840.113556.1.4.478</td> <td><tt>calCalURI</tt> Attribute Type</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.2.840.113556.1.4.479</td> <td><tt>calFBURL</tt> Attribute Type</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.2.840.113556.1.4.480</td> <td><tt>calCAPURI</tt> Attribute Type</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.2.840.113556.1.4.481</td> <td><tt>calCalAdrURI</tt> Attribute Type</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.2.840.113556.1.4.482</td> <td><tt>calOtherCalURIs</tt> Attribute Type</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.2.840.113556.1.4.483</td> <td><tt>calOtherFBURLs</tt> Attribute Type</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.2.840.113556.1.4.484</td> <td><tt>calOtherCAPURIs</tt> Attribute Type</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.2.840.113556.1.4.485</td> <td><tt>calOtherCalAdrURIs</tt> Attribute Type</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.2.840.113556.1.4.805</td> <td>Tree Delete Request Control</td> - <td><a href="specs/draft-armijo-ldap-treedelete-02.txt" target="_blank">draft-armijo-ldap-treedelete</a></td> + <td><a href="https://docs.ldap.com/specs/draft-armijo-ldap-treedelete-02.txt" target="_blank">draft-armijo-ldap-treedelete</a></td> </tr> <tr> <td>1.2.840.113556.1.4.841</td> <td>DirSync Request Control</td> - <td>Active Directory</td> + <td>Microsoft Active Directory</td> </tr> <tr> <td>1.2.840.113556.1.4.1413</td> <td>Permissive Modify Request Control</td> - <td>Active Directory</td> + <td>Microsoft Active Directory</td> </tr> <tr> <td>1.2.840.113556.1.4.1504</td> <td>Attribute Scoped Query Request Control</td> - <td><a href="specs/draft-kashi-attr-scoped-query-01.txt" target="_blank">draft-kashi-attr-scoped-query</a></td> + <td><a href="https://docs.ldap.com/specs/draft-kashi-attr-scoped-query-01.txt" target="_blank">draft-kashi-attr-scoped-query</a></td> </tr> <tr> <td>1.2.840.113556.1.5.87</td> <td><tt>calEntry</tt> Object Class</td> - <td><a href="specs/rfc2739.txt" target="_blank">RFC 2739</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2739.txt" target="_blank">RFC 2739</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.0</td> <td><tt>uidNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.1</td> <td><tt>gidNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.2</td> <td><tt>gecos</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.3</td> <td><tt>homeDirectory</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.4</td> <td><tt>loginShell</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.5</td> <td><tt>shadowLastChange</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.6</td> <td><tt>shadowMin</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.7</td> <td><tt>shadowMax</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.8</td> <td><tt>shadowWarning</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.9</td> <td><tt>shadowInactive</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.10</td> <td><tt>shadowExpire</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.11</td> <td><tt>shadowFlag</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.12</td> <td><tt>memberUid</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.13</td> <td><tt>memberNisNetgroup</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.14</td> <td><tt>nisNetgroupTriple</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.15</td> <td><tt>ipServicePort</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.16</td> <td><tt>ipServiceProtocol</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.17</td> <td><tt>ipProtocolNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.18</td> <td><tt>oncRpcNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.19</td> <td><tt>ipHostNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.20</td> <td><tt>ipNetworkNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.21</td> <td><tt>ipNetmaskNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.22</td> <td><tt>macAddress</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.23</td> <td><tt>bootParameter</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.24</td> <td><tt>bootFile</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.26</td> <td><tt>nisMapName</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.27</td> <td><tt>nisMapEntry</tt> Attribute Type</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.28</td> <td><tt>nisPublicKey</tt> Attribute Type</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.29</td> <td><tt>nisSecretKey</tt> Attribute Type</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.30</td> <td><tt>nisDomain</tt> Attribute Type</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.31</td> <td><tt>automountMapName</tt> Attribute Type</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.32</td> <td><tt>automountKey</tt> Attribute Type</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.1.33</td> <td><tt>automountInformation</tt> Attribute Type</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.0</td> <td><tt>posixAccount</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.1</td> <td><tt>shadowAccount</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.2</td> <td><tt>posixGroup</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.3</td> <td><tt>ipService</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.4</td> <td><tt>ipProtocol</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.5</td> <td><tt>oncRpc</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.6</td> <td><tt>ipHost</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.7</td> <td><tt>ipNetwork</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.8</td> <td><tt>nisNetgroup</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.9</td> <td><tt>nisMap</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.10</td> <td><tt>nisObject</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.11</td> <td><tt>ieee802Device</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.12</td> <td><tt>bootableDevice</tt> Object Class</td> - <td><a href="specs/rfc2307.txt" target="_blank">RFC 2307</a> and <a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2307.txt" target="_blank">RFC 2307</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.14</td> <td><tt>nisKeyObject</tt> Object Class</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.15</td> <td><tt>nisDomainObject</tt> Object Class</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.16</td> <td><tt>automountMap</tt> Object Class</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.1.2.17</td> <td><tt>automount</tt> Object Class</td> - <td><a href="specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-rfc2307bis-02.txt" target="_blank">draft-howard-rfc2307bis</a></td> </tr> <tr> <td>1.3.6.1.1.3.1</td> <td><tt>uidObject</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>1.3.6.1.1.4</td> <td><tt>vendorName</tt> Attribute Type</td> - <td><a href="specs/rfc3045.txt" target="_blank">RFC 3045</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3045.txt" target="_blank">RFC 3045</a></td> </tr> <tr> <td>1.3.6.1.1.5</td> <td><tt>vendorVersion</tt> Attribute Type</td> - <td><a href="specs/rfc3045.txt" target="_blank">RFC 3045</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3045.txt" target="_blank">RFC 3045</a></td> </tr> <tr> <td>1.3.6.1.1.7.1</td> <td>LCUP (LDAP Client Update Protocol) Sync Request Control</td> - <td><a href="specs/rfc3928.txt" target="_blank">RFC 3928</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3928.txt" target="_blank">RFC 3928</a></td> </tr> <tr> <td>1.3.6.1.1.7.2</td> <td>LCUP (LDAP Client Update Protocol) Sync Update Control</td> - <td><a href="specs/rfc3928.txt" target="_blank">RFC 3928</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3928.txt" target="_blank">RFC 3928</a></td> </tr> <tr> <td>1.3.6.1.1.7.3</td> <td>LCUP (LDAP Client Update Protocol) Sync Done Control</td> - <td><a href="specs/rfc3928.txt" target="_blank">RFC 3928</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3928.txt" target="_blank">RFC 3928</a></td> </tr> <tr> <td>1.3.6.1.1.8</td> <td>Cancel Extended Request</td> - <td><a href="specs/rfc3909.txt" target="_blank">RFC 3909</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3909.txt" target="_blank">RFC 3909</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.1</td> <td><tt>uddiBusinessKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.2</td> <td><tt>uddiAuthorizedName</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.3</td> <td><tt>uddiOperator</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.4</td> <td><tt>uddiName</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.5</td> <td><tt>uddiDescription</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.6</td> <td><tt>uddiDiscoveryURLs</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.7</td> <td><tt>uddiUseType</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.8</td> <td><tt>uddiPersonName</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.9</td> <td><tt>uddiPhone</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.10</td> <td><tt>uddiEMail</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.11</td> <td><tt>uddiSortCode</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.12</td> <td><tt>uddiTModelKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.13</td> <td><tt>uddiAddressLine</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.14</td> <td><tt>uddiIdentifierBag</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.15</td> <td><tt>uddiCategoryBag</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.16</td> <td><tt>uddiKeyedReference</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.17</td> <td><tt>uddiServiceKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.18</td> <td><tt>uddiBindingKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.19</td> <td><tt>uddiAccessPoint</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.20</td> <td><tt>uddiHostingRedirector</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.21</td> <td><tt>uddiInstanceDescription</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.22</td> <td><tt>uddiInstanceParms</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.23</td> <td><tt>uddiOverviewDescription</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.24</td> <td><tt>uddiOverviewURL</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.25</td> <td><tt>uddiFromKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.26</td> <td><tt>uddiToKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.27</td> <td><tt>uddiUUID</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.28</td> <td><tt>uddiIsHidden</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.29</td> <td><tt>uddiIsProjection</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.30</td> <td><tt>uddiLang</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.31</td> <td><tt>uddiv3BusinessKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.32</td> <td><tt>uddiv3ServiceKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.33</td> <td><tt>uddiv3BindingKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.34</td> <td><tt>uddiv3TModelKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.35</td> <td><tt>uddiv3DigitalSignature</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.36</td> <td><tt>uddiv3NodeId</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.37</td> <td><tt>uddiv3EntityModificationTime</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.38</td> <td><tt>uddiv3SubscriptionKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.39</td> <td><tt>uddiv3SubscriptionFilter</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.40</td> <td><tt>uddiv3NotificationInterval</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.41</td> <td><tt>uddiv3MaxEntities</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.42</td> <td><tt>uddiv3ExpiresAfter</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.43</td> <td><tt>uddiv3BriefResponse</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.44</td> <td><tt>uddiv3EntityKey</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.45</td> <td><tt>uddiv3EntityCreationTime</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.4.46</td> <td><tt>uddiv3EntityDeletionTime</tt> Attribute Type</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.1</td> <td><tt>uddiBusinessEntity</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.2</td> <td><tt>uddiContact</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.3</td> <td><tt>uddiAddress</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.4</td> <td><tt>uddiBusinessService</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.5</td> <td><tt>uddiBindingTemplate</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.6</td> <td><tt>uddiTModelInstanceInfo</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.7</td> <td><tt>uddiTModel</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.8</td> <td><tt>uddiPublisherAssertion</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.9</td> <td><tt>uddiv3Subscription</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.10.6.10</td> <td><tt>uddiv3EntityObituary</tt> Object Class</td> - <td><a href="specs/rfc4403.txt" target="_blank">RFC 4403</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4403.txt" target="_blank">RFC 4403</a></td> </tr> <tr> <td>1.3.6.1.1.12</td> <td>LDAP Assertion Request Control</td> - <td><a href="specs/rfc4528.txt" target="_blank">RFC 4528</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4528.txt" target="_blank">RFC 4528</a></td> </tr> <tr> <td>1.3.6.1.1.13.1</td> - <td>LDAP Pre-Read Request and Response Controls</td> - <td><a href="specs/rfc4527.txt" target="_blank">RFC 4527</a></td> + <td>LDAP Pre-Read Request and Response Control</td> + <td><a href="https://docs.ldap.com/specs/rfc4527.txt" target="_blank">RFC 4527</a></td> </tr> <tr> <td>1.3.6.1.1.13.2</td> - <td>LDAP Post-Read Request and Response Controls</td> - <td><a href="specs/rfc4527.txt" target="_blank">RFC 4527</a></td> + <td>LDAP Post-Read Request and Response Control</td> + <td><a href="https://docs.ldap.com/specs/rfc4527.txt" target="_blank">RFC 4527</a></td> </tr> <tr> <td>1.3.6.1.1.14</td> - <td>LDAP Modify-Increment Extension Feature</td> - <td><a href="specs/rfc4525.txt" target="_blank">RFC 4525</a></td> + <td>LDAP Modify-Increment Extension Feature Feature</td> + <td><a href="https://docs.ldap.com/specs/rfc4525.txt" target="_blank">RFC 4525</a></td> </tr> <tr> <td>1.3.6.1.1.16.4</td> <td><tt>entryUUID</tt> Attribute Type</td> - <td><a href="specs/rfc4530.txt" target="_blank">RFC 4530</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4530.txt" target="_blank">RFC 4530</a></td> </tr> <tr> <td>1.3.6.1.1.17.1</td> <td>Start LBURP (LDAP Bulk Update/Replication Protocol) Extended Request</td> - <td><a href="specs/rfc4373.txt" target="_blank">RFC 4373</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4373.txt" target="_blank">RFC 4373</a></td> </tr> <tr> <td>1.3.6.1.1.17.2</td> <td>Start LBURP (LDAP Bulk Update/Replication Protocol) Extended Response</td> - <td><a href="specs/rfc4373.txt" target="_blank">RFC 4373</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4373.txt" target="_blank">RFC 4373</a></td> </tr> <tr> <td>1.3.6.1.1.17.3</td> <td>End LBURP (LDAP Bulk Update/Replication Protocol) Extended Request</td> - <td><a href="specs/rfc4373.txt" target="_blank">RFC 4373</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4373.txt" target="_blank">RFC 4373</a></td> </tr> <tr> <td>1.3.6.1.1.17.4</td> <td>End LBURP (LDAP Bulk Update/Replication Protocol) Extended Response</td> - <td><a href="specs/rfc4373.txt" target="_blank">RFC 4373</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4373.txt" target="_blank">RFC 4373</a></td> </tr> <tr> <td>1.3.6.1.1.17.5</td> <td>LBURP (LDAP Bulk Update/Replication Protocol) Update Extended Response</td> - <td><a href="specs/rfc4373.txt" target="_blank">RFC 4373</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4373.txt" target="_blank">RFC 4373</a></td> </tr> <tr> <td>1.3.6.1.1.17.6</td> <td>LBURP (LDAP Bulk Update/Replication Protocol) Update Extended Request</td> - <td><a href="specs/rfc4373.txt" target="_blank">RFC 4373</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4373.txt" target="_blank">RFC 4373</a></td> </tr> <tr> <td>1.3.6.1.1.17.7</td> - <td>LBURP (LDAP Bulk Update/Replication Protocol) Incremental Update Style</td> - <td><a href="specs/rfc4373.txt" target="_blank">RFC 4373</a></td> + <td>LBURP (LDAP Bulk Update/Replication Protocol) Incremental Update Style LBURP Update Style</td> + <td><a href="https://docs.ldap.com/specs/rfc4373.txt" target="_blank">RFC 4373</a></td> </tr> <tr> <td>1.3.6.1.1.19</td> <td>LDAP Turn Extended Request</td> - <td><a href="specs/rfc4531.txt" target="_blank">RFC 4531</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4531.txt" target="_blank">RFC 4531</a></td> </tr> <tr> <td>1.3.6.1.1.20</td> <td><tt>entryDN</tt> Attribute Type</td> - <td><a href="specs/rfc5020.txt" target="_blank">RFC 5020</a></td> + <td><a href="https://docs.ldap.com/specs/rfc5020.txt" target="_blank">RFC 5020</a></td> </tr> <tr> <td>1.3.6.1.1.21.1</td> <td>Start Transaction Extended Request</td> - <td><a href="specs/rfc5805.txt" target="_blank">RFC 5805</a></td> + <td><a href="https://docs.ldap.com/specs/rfc5805.txt" target="_blank">RFC 5805</a></td> </tr> <tr> <td>1.3.6.1.1.21.2</td> <td>Transaction Specification Request Control</td> - <td><a href="specs/rfc5805.txt" target="_blank">RFC 5805</a></td> + <td><a href="https://docs.ldap.com/specs/rfc5805.txt" target="_blank">RFC 5805</a></td> </tr> <tr> <td>1.3.6.1.1.21.3</td> <td>End Transaction Extended Request</td> - <td><a href="specs/rfc5805.txt" target="_blank">RFC 5805</a></td> + <td><a href="https://docs.ldap.com/specs/rfc5805.txt" target="_blank">RFC 5805</a></td> </tr> <tr> <td>1.3.6.1.1.21.4</td> <td>Aborted Transaction Unsolicited Notification</td> - <td><a href="specs/rfc5805.txt" target="_blank">RFC 5805</a></td> + <td><a href="https://docs.ldap.com/specs/rfc5805.txt" target="_blank">RFC 5805</a></td> </tr> <tr> <td>1.3.6.1.1.22</td> <td>LDAP Don’t Use Copy Control</td> - <td><a href="specs/rfc6171.txt" target="_blank">RFC 6171</a></td> + <td><a href="https://docs.ldap.com/specs/rfc6171.txt" target="_blank">RFC 6171</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.6</td> <td><tt>javaClassName</tt> Attribute Type</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.7</td> <td><tt>javaCodebase</tt> Attribute Type</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.8</td> <td><tt>javaSerializedData</tt> Attribute Type</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.10</td> <td><tt>javaFactory</tt> Attribute Type</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.11</td> <td><tt>javaReferenceAddress</tt> Attribute Type</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.12</td> <td><tt>javaDoc</tt> Attribute Type</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.13</td> <td><tt>javaClassNames</tt> Attribute Type</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.14</td> <td><tt>corbaIor</tt> Attribute Type</td> - <td><a href="specs/rfc2714.txt" target="_blank">RFC 2714</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2714.txt" target="_blank">RFC 2714</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.1.15</td> <td><tt>corbaRepositoryId</tt> Attribute Type</td> - <td><a href="specs/rfc2714.txt" target="_blank">RFC 2714</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2714.txt" target="_blank">RFC 2714</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.2.1</td> <td><tt>javaContainer</tt> Object Class</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.2.4</td> <td><tt>javaObject</tt> Object Class</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.2.5</td> <td><tt>javaSerializedObject</tt> Object Class</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.2.7</td> <td><tt>javaNamingReference</tt> Object Class</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.2.8</td> <td><tt>javaMarshalledObject</tt> Object Class</td> - <td><a href="specs/rfc2713.txt" target="_blank">RFC 2713</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2713.txt" target="_blank">RFC 2713</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.2.9</td> <td><tt>corbaObject</tt> Object Class</td> - <td><a href="specs/rfc2714.txt" target="_blank">RFC 2714</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2714.txt" target="_blank">RFC 2714</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.2.10</td> <td><tt>corbaContainer</tt> Object Class</td> - <td><a href="specs/rfc2714.txt" target="_blank">RFC 2714</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2714.txt" target="_blank">RFC 2714</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.4.2.11</td> <td><tt>corbaObjectReference</tt> Object Class</td> - <td><a href="specs/rfc2714.txt" target="_blank">RFC 2714</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2714.txt" target="_blank">RFC 2714</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.1</td> <td><tt>pwdAttribute</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.2</td> <td><tt>pwdMinAge</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.3</td> <td><tt>pwdMaxAge</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.4</td> <td><tt>pwdInHistory</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.5</td> <td><tt>pwdCheckQuality</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.6</td> <td><tt>pwdMinLength</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.7</td> <td><tt>pwdExpireWarning</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.8</td> <td><tt>pwdGraceAuthNLimit</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.9</td> <td><tt>pwdLockout</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.10</td> <td><tt>pwdLockoutDuration</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.11</td> <td><tt>pwdMaxFailure</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.12</td> <td><tt>pwdFailureCountInterval</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.13</td> <td><tt>pwdMustChange</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.14</td> <td><tt>pwdAllowUserChange</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.15</td> <td><tt>pwdSafeModify</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.16</td> <td><tt>pwdChangedTime</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.17</td> <td><tt>pwdAccountLockedTime</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.19</td> <td><tt>pwdFailureTime</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.20</td> <td><tt>pwdHistory</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.21</td> <td><tt>pwdGraceUseTime</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.22</td> <td><tt>pwdReset</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.1.23</td> <td><tt>pwdPolicySubentry</tt> Attribute Type</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.2.1</td> <td><tt>pwdPolicy</tt> Object Class</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.8.5.1</td> - <td>Password Policy Request and Response Controls</td> - <td><a href="specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> + <td>Password Policy Request and Response Control</td> + <td><a href="https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" target="_blank">draft-behera-ldap-password-policy</a></td> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.9.1.39</td> @@ -1413,2028 +1413,3093 @@ <h2>LDAP OID Reference</h2> </tr> <tr> <td>1.3.6.1.4.1.42.2.27.9.5.8</td> - <td>Account Usable Request and Response Controls</td> + <td>Account Usable Request and Response Control</td> <td>Sun Java System Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.250.1.41</td> <td><tt>labeledURL</tt> Attribute Type</td> - <td><a href="specs/rfc2079.txt" target="_blank">RFC 2079</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2079.txt" target="_blank">RFC 2079</a></td> </tr> <tr> <td>1.3.6.1.4.1.250.1.57</td> <td><tt>labeledURI</tt> Attribute Type</td> - <td><a href="specs/rfc2079.txt" target="_blank">RFC 2079</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2079.txt" target="_blank">RFC 2079</a></td> </tr> <tr> <td>1.3.6.1.4.1.250.3.15</td> <td><tt>labeledURIObject</tt> Object Class</td> - <td><a href="specs/rfc2079.txt" target="_blank">RFC 2079</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2079.txt" target="_blank">RFC 2079</a></td> </tr> <tr> <td>1.3.6.1.4.1.453.16.2.103</td> <td><tt>numSubordinates</tt> Attribute Type</td> - <td><a href="specs/draft-ietf-boreham-numsubordinates-01.txt" target="_blank">draft-ietf-boreham-numsubordinates</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-boreham-numsubordinates-01.txt" target="_blank">draft-ietf-boreham-numsubordinates</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.1</td> <td><tt>administratorsAddress</tt> Attribute Type</td> - <td><a href="specs/draft-wahl-ldap-adminaddr-05.txt" target="_blank">draft-wahl-ldap-adminaddr</a></td> + <td><a href="https://docs.ldap.com/specs/draft-wahl-ldap-adminaddr-05.txt" target="_blank">draft-wahl-ldap-adminaddr</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.5</td> <td><tt>namingContexts</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.6</td> <td><tt>altServer</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.7</td> <td><tt>supportedExtension</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.13</td> <td><tt>supportedControl</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.14</td> <td><tt>supportedSASLMechanisms</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.15</td> <td><tt>supportedLDAPVersion</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.16</td> <td><tt>ldapSyntaxes</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.101.120.111</td> <td><tt>extensibleObject</tt> Object Class</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.109.114.1</td> <td><tt>caseExactIA5Match</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.109.114.2</td> <td><tt>caseIgnoreIA5Match</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.109.114.3</td> <td><tt>caseIgnoreIA5SubstringsMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.3</td> <td>Attribute Type Description Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.6</td> <td>Bit String Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.7</td> <td>Boolean Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.11</td> <td>Country String Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.12</td> <td>DN Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.14</td> <td>Delivery Method Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.15</td> <td>Directory String Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.16</td> <td>DIT Content Rule Description Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.17</td> <td>DIT Structure Rule Description Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.21</td> <td>Enhanced Guide Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.22</td> <td>Facsimile Telephone Number Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.23</td> <td>Fax Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.24</td> <td>Generalized Time Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.25</td> <td>Guide Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.26</td> <td>IA5 String Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.27</td> <td>INTEGER Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.28</td> <td>JPEG Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.30</td> <td>Matching Rule Description Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.31</td> <td>Matching Rule Use Description Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.34</td> <td>Name And Optional UID Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.35</td> <td>Name Form Description Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.36</td> <td>Numeric String Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.37</td> <td>Object Class Description Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.38</td> <td>OID Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.39</td> <td>Other Mailbox Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.40</td> <td>Octet String Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.41</td> <td>Postal Address Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.44</td> <td>Printable String Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.50</td> <td>Telephone Number Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.51</td> <td>Teletex Terminal Identifier Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.52</td> <td>Telex Number Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.53</td> <td>UTC Time Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.54</td> <td>LDAP Syntax Description Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.115.121.1.58</td> <td>Substring Assertion Attribute Syntax</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.344</td> <td><tt>dcObject</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.20036</td> <td>Notice of Disconnection Unsolicited Notification</td> - <td><a href="specs/rfc4511.txt" target="_blank">RFC 4511</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4511.txt" target="_blank">RFC 4511</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.20037</td> <td>StartTLS Extended Request</td> - <td><a href="specs/rfc4511.txt" target="_blank">RFC 4511</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4511.txt" target="_blank">RFC 4511</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.29539.10</td> <td>LDAP Triggered Search Request Control</td> - <td><a href="specs/draft-ietf-ldapext-trigger-01.txt" target="_blank">draft-ietf-ldapext-trigger</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldapext-trigger-01.txt" target="_blank">draft-ietf-ldapext-trigger</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.29539.10.1</td> <td><tt>dnSubordinateTo</tt> Matching Rule</td> - <td><a href="specs/draft-ietf-ldapext-trigger-01.txt" target="_blank">draft-ietf-ldapext-trigger</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldapext-trigger-01.txt" target="_blank">draft-ietf-ldapext-trigger</a></td> </tr> <tr> <td>1.3.6.1.4.1.1466.29539.13</td> <td>LDAP Triggered Search Response Control</td> - <td><a href="specs/draft-ietf-ldapext-trigger-01.txt" target="_blank">draft-ietf-ldapext-trigger</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldapext-trigger-01.txt" target="_blank">draft-ietf-ldapext-trigger</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.3.3</td> <td><tt>supportedAuthPasswordSchemes</tt> Attribute Type</td> - <td><a href="specs/rfc3112.txt" target="_blank">RFC 3112</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3112.txt" target="_blank">RFC 3112</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.3.4</td> <td><tt>authPassword</tt> Attribute Type</td> - <td><a href="specs/rfc3112.txt" target="_blank">RFC 3112</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3112.txt" target="_blank">RFC 3112</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.3.5</td> <td><tt>supportedFeatures</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.4.7</td> <td><tt>authPasswordObject</tt> Object Class</td> - <td><a href="specs/rfc3112.txt" target="_blank">RFC 3112</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3112.txt" target="_blank">RFC 3112</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.5.1</td> <td>All Operational Attributes Feature</td> - <td><a href="specs/rfc3673.txt" target="_blank">RFC 3673</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3673.txt" target="_blank">RFC 3673</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.5.2</td> - <td>Requesting Attributes by Object Class Feature</td> - <td><a href="specs/rfc4529.txt" target="_blank">RFC 4529</a></td> + <td><tt>Requesting Attributes by</tt> Object Class</td> + <td><a href="https://docs.ldap.com/specs/rfc4529.txt" target="_blank">RFC 4529</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.5.3</td> <td>LDAP Absolute True and False Filters Feature</td> - <td><a href="specs/rfc4526.txt" target="_blank">RFC 4526</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4526.txt" target="_blank">RFC 4526</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.9.1.1</td> <td>LDAP Content Synchronization Request Control</td> - <td><a href="specs/rfc4533.txt" target="_blank">RFC 4533</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4533.txt" target="_blank">RFC 4533</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.9.1.2</td> <td>LDAP Content Synchronization State Control</td> - <td><a href="specs/rfc4533.txt" target="_blank">RFC 4533</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4533.txt" target="_blank">RFC 4533</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.9.1.3</td> <td>LDAP Content Synchronization Done Control</td> - <td><a href="specs/rfc4533.txt" target="_blank">RFC 4533</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4533.txt" target="_blank">RFC 4533</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.9.1.4</td> <td>LDAP Content Synchronization Info Intermediate Response</td> - <td><a href="specs/rfc4533.txt" target="_blank">RFC 4533</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4533.txt" target="_blank">RFC 4533</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.10.1</td> <td>LDAP Subentries Request Control</td> - <td><a href="specs/rfc3672.txt" target="_blank">RFC 3672</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3672.txt" target="_blank">RFC 3672</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.10.2</td> <td>LDAP No-Op Request Control</td> - <td><a href="specs/draft-zeilenga-ldap-noop-12.txt" target="_blank">draft-zeilenga-ldap-noop</a></td> + <td><a href="https://docs.ldap.com/specs/draft-zeilenga-ldap-noop-12.txt" target="_blank">draft-zeilenga-ldap-noop</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.11.1</td> <td>Password Modify Extended Request</td> - <td><a href="specs/rfc3062.txt" target="_blank">RFC 3062</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3062.txt" target="_blank">RFC 3062</a></td> </tr> <tr> <td>1.3.6.1.4.1.4203.1.11.3</td> <td>"Who Am I?" Extended Request</td> - <td><a href="specs/rfc4532.txt" target="_blank">RFC 4532</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4532.txt" target="_blank">RFC 4532</a></td> </tr> <tr> <td>1.3.6.1.4.1.5322.13.1.1</td> <td><tt>namedObject</tt> Object Class</td> - <td><a href="specs/draft-howard-namedobject-01.txt" target="_blank">draft-howard-namedobject</a></td> + <td><a href="https://docs.ldap.com/specs/draft-howard-namedobject-01.txt" target="_blank">draft-howard-namedobject</a></td> </tr> <tr> <td>1.3.6.1.4.1.5515.3.1</td> <td>Copy Subtree Extended Request</td> - <td><a href="specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> + <td><a href="https://docs.ldap.com/specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> </tr> <tr> <td>1.3.6.1.4.1.5515.3.2</td> <td>Copy Subtree Extended Response</td> - <td><a href="specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> + <td><a href="https://docs.ldap.com/specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> </tr> <tr> <td>1.3.6.1.4.1.5515.3.3</td> <td>Delete Subtree Extended Request</td> - <td><a href="specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> + <td><a href="https://docs.ldap.com/specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> </tr> <tr> <td>1.3.6.1.4.1.5515.3.4</td> <td>Delete Subtree Extended Response</td> - <td><a href="specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> + <td><a href="https://docs.ldap.com/specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> </tr> <tr> <td>1.3.6.1.4.1.5515.3.5</td> <td>Update Subtree Extended Request</td> - <td><a href="specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> + <td><a href="https://docs.ldap.com/specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> </tr> <tr> <td>1.3.6.1.4.1.5515.3.6</td> <td>Update Subtree Extended Response</td> - <td><a href="specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> + <td><a href="https://docs.ldap.com/specs/draft-greenblatt-ldapext-sos-01.txt" target="_blank">draft-greenblatt-ldapext-sos</a></td> </tr> <tr> <td>1.3.6.1.4.1.6252.2.27.6.1.1</td> <td><tt>template-major-version-number</tt> Attribute Type</td> - <td><a href="specs/rfc2926.txt" target="_blank">RFC 2926</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2926.txt" target="_blank">RFC 2926</a></td> </tr> <tr> <td>1.3.6.1.4.1.6252.2.27.6.1.2</td> <td><tt>template-minor-version-number</tt> Attribute Type</td> - <td><a href="specs/rfc2926.txt" target="_blank">RFC 2926</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2926.txt" target="_blank">RFC 2926</a></td> </tr> <tr> <td>1.3.6.1.4.1.6252.2.27.6.1.3</td> <td><tt>template-url-syntax</tt> Attribute Type</td> - <td><a href="specs/rfc2926.txt" target="_blank">RFC 2926</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2926.txt" target="_blank">RFC 2926</a></td> </tr> <tr> <td>1.3.6.1.4.1.6252.2.27.6.1.4</td> <td><tt>service-advert-service-type</tt> Attribute Type</td> - <td><a href="specs/rfc2926.txt" target="_blank">RFC 2926</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2926.txt" target="_blank">RFC 2926</a></td> </tr> <tr> <td>1.3.6.1.4.1.6252.2.27.6.1.5</td> <td><tt>service-advert-scopes</tt> Attribute Type</td> - <td><a href="specs/rfc2926.txt" target="_blank">RFC 2926</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2926.txt" target="_blank">RFC 2926</a></td> </tr> <tr> <td>1.3.6.1.4.1.6252.2.27.6.1.6</td> <td><tt>service-advert-url-authenticator</tt> Attribute Type</td> - <td><a href="specs/rfc2926.txt" target="_blank">RFC 2926</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2926.txt" target="_blank">RFC 2926</a></td> </tr> <tr> <td>1.3.6.1.4.1.6252.2.27.6.1.7</td> <td><tt>service-advert-attribute-authenticator</tt> Attribute Type</td> - <td><a href="specs/rfc2926.txt" target="_blank">RFC 2926</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2926.txt" target="_blank">RFC 2926</a></td> </tr> <tr> <td>1.3.6.1.4.1.6252.2.27.6.2.1</td> <td><tt>slpService</tt> Object Class</td> - <td><a href="specs/rfc2926.txt" target="_blank">RFC 2926</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2926.txt" target="_blank">RFC 2926</a></td> </tr> <tr> <td>1.3.6.1.4.1.7628.5.4.1</td> <td><tt>inheritable</tt> Attribute Type</td> - <td><a href="specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> </tr> <tr> <td>1.3.6.1.4.1.7628.5.4.2</td> <td><tt>blockInheritance</tt> Attribute Type</td> - <td><a href="specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> </tr> <tr> <td>1.3.6.1.4.1.7628.5.6.1.1</td> <td><tt>inheritableLDAPSubEntry</tt> Object Class</td> - <td><a href="specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> </tr> <tr> <td>1.3.6.1.4.1.7628.5.101.1</td> <td>LDAP Subentries Request Control</td> - <td><a href="specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> </tr> <tr> <td>1.3.6.1.4.1.21008.108.63.1</td> <td>LDAP Session Tracking Control</td> - <td><a href="specs/draft-wahl-ldap-session-03.txt" target="_blank">draft-wahl-ldap-session</a></td> + <td><a href="https://docs.ldap.com/specs/draft-wahl-ldap-session-03.txt" target="_blank">draft-wahl-ldap-session</a></td> </tr> <tr> <td>1.3.6.1.4.1.30221.1.2.900</td> <td><tt>untypedObject</tt> Object Class</td> - <td><a href="specs/draft-furuseth-ldap-untypedobject-02.txt" target="_blank">draft-furuseth-ldap-untypedobject</a></td> + <td><a href="https://docs.ldap.com/specs/draft-furuseth-ldap-untypedobject-02.txt" target="_blank">draft-furuseth-ldap-untypedobject</a></td> </tr> <tr> <td>1.3.6.1.4.1.30221.1.5.2</td> <td>Replication Repair Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.1.6.1</td> <td>Password Policy State Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.1.6.2</td> <td>Get Connection ID Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.1.6.20</td> + <td>Get Subtree Accessibility Extended Request</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.1.6.21</td> + <td>Get Subtree Accessibility Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.636</td> <td><tt>entry-size-bytes</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1759</td> <td><tt>ubidExternalID</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1760</td> <td><tt>ubidMiddleName</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1761</td> <td><tt>ubidHonorificPrefix</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1762</td> <td><tt>ubidHonorificSuffix</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1763</td> <td><tt>ubidNickName</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1764</td> <td><tt>ubidEmailJSON</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1765</td> <td><tt>ubidPhoneNumberJSON</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1766</td> <td><tt>ubidPostalAddressJSON</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1767</td> <td><tt>ubidAccountVerified</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1768</td> <td><tt>ubidMiddleInitial</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1769</td> <td><tt>ubidBirthDate</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1770</td> <td><tt>ubidEntitlement</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1785</td> <td><tt>ubidPhotoURL</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1904</td> <td><tt>ubidSecondFactorEnabled</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1921</td> <td><tt>ubidSecondFactorEmail</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.1.1922</td> <td><tt>ubidSecondFactorPhoneNumber</tt> Attribute Type</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.2.645</td> <td><tt>ubidPerson</tt> Object Class</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.2.646</td> <td><tt>ubidPersonAux</tt> Object Class</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.3.1</td> <td>Compact Timestamp Attribute Syntax</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.3.2</td> <td>LDAP URL Attribute Syntax</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.3.3</td> <td>Hexadecimal String Attribute Syntax</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.3.4</td> <td>JSON Object Attribute Syntax</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.1</td> <td><tt>compactTimestampMatch</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.2</td> <td><tt>compactTimestampOrderingMatch</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.3</td> <td><tt>ldapURLMatch</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.4</td> <td><tt>hexStringMatch</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.5</td> <td><tt>hexStringOrderingMatch</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.6</td> <td><tt>valueCountEquals</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.7</td> <td><tt>valueCountDoesNotEqual</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.8</td> <td><tt>valueCountGreaterThan</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.9</td> <td><tt>valueCountGreaterThanOrEqualTo</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.10</td> <td><tt>valueCountLessThan</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.11</td> <td><tt>valueCountLessThanOrEqualTo</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.12</td> <td><tt>jsonObjectExactMatch</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.13</td> <td><tt>jsonObjectFilterExtensibleMatch</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.14</td> <td><tt>relativeTimeExtensibleMatch</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.15</td> <td><tt>jsonObjectCaseSensitiveNamesCaseSensitiveValues</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.16</td> <td><tt>jsonObjectCaseInsensitiveNamesCaseSensitiveValues</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.4.17</td> <td><tt>jsonObjectCaseInsensitiveNamesCaseInsensitiveValues</tt> Matching Rule</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.1</td> <td>Batched Transaction Specification Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.2</td> - <td>Intermediate Client Request and Response Controls</td> - <td>UnboundID Directory Server</td> + <td>Intermediate Client Request and Response Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.3</td> <td>Retain Identity Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.4</td> - <td>Interactive Transaction Specification Request and Response Controls</td> - <td>UnboundID Directory Server</td> + <td>Interactive Transaction Specification Request and Response Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.5</td> <td>Ignore NO-USER-MODIFICATION Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.6</td> - <td>Get Authorization Entry Request and Response Controls</td> - <td>UnboundID Directory Server</td> + <td>Get Authorization Entry Request and Response Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.7</td> <td>Unsolicited Cancel Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.8</td> + <td>Connection Closed Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.9</td> - <td>Join Request and Result Controls</td> - <td>UnboundID Directory Server</td> + <td>Join Request and Result Control</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.10</td> + <td>Suppress Configuration Audit Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.11</td> <td>Administrative Operation Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.12</td> <td>Extended Schema Info Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.13</td> <td>Return Conflict Entries Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.14</td> <td>Get Server ID Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.15</td> <td>Get Server ID Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.16</td> <td>Route to Server Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.17</td> <td>Exclude Branch Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.18</td> + <td>Internal Operation Request Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.19</td> <td>Operation Purpose Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.20</td> <td>Soft Delete Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.21</td> <td>Soft Delete Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.22</td> <td>Hard Delete Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.23</td> <td>Undelete Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.24</td> <td>Soft-Deleted Entry Access Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.25</td> <td>Get User Resource Limits Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.26</td> <td>Get User Resource Limits Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.27</td> <td>Suppress Operational Attribute Update Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.28</td> <td>Assured Replication Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.29</td> <td>Assured Replication Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.30</td> <td>Suppress Referential Integrity Updates Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.31</td> <td>Retire Password Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.32</td> <td>Purge Password Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.33</td> <td>Get Backend Set ID Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.34</td> <td>Get Backend Set ID Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.35</td> <td>Route to Backend Set Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.36</td> <td>Matching Entry Count Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.37</td> <td>Matching Entry Count Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.38</td> <td>Transaction Settings Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.39</td> <td>Transaction Settings Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.40</td> <td>Password Validation Details Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.41</td> <td>Password Validation Details Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.42</td> + <td>Inter-Server Request Control</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.43</td> + <td>Inter-Server Request Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.44</td> <td>Name with entryUUID Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.45</td> + <td>Permit entryUUID Naming Attribute Request Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.46</td> <td>Get Password Policy State Issues Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.47</td> <td>Get Password Policy State Issues Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.48</td> + <td>Proxied MS-CHAPv2 Details Request Control</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.49</td> + <td>Return OTP Request Control</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.50</td> + <td>Return OTP Response Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.51</td> <td>Password Update Behavior Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.52</td> <td>Uniqueness Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.53</td> <td>Uniqueness Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.54</td> <td>Reject Unindexed Search Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.55</td> <td>Permit Unindexed Search Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.56</td> <td>Override Search Limits Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.57</td> + <td>Pass Through Mirroring Request Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.58</td> <td>Generate Password Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.59</td> <td>Generate Password Response Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.5.60</td> <td>OAuth Scopes Request Control</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.61</td> + <td>Get Recent Login History Request Control</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.5.62</td> + <td>Get Recent Login History Request Control</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.1</td> <td>Start Batched Transaction Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.2</td> <td>End Batched Transaction Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.3</td> <td>Start Interactive Transaction Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.4</td> <td>End Interactive Transaction Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.5</td> <td>Interactive Transaction Aborted Unsolicited Notification</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.6</td> <td>Stream Directory Values Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.7</td> <td>Stream Directory Values Intermediate Response</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.8</td> <td>Stream Proxy Values Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.9</td> <td>Stream Proxy Values Intermediate Response</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.10</td> <td>Get Changelog Batch Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.11</td> <td>Changelog Entry Intermediate Response</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.12</td> <td>Missing Changelog Entries Intermediate Response</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.13</td> <td>Start Administrative Session Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.14</td> <td>End Administrative Session Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.15</td> <td>Validate TOTP Password Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.6.16</td> + <td>Validate TOTP Password Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.17</td> <td>Multi-Update Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.18</td> - <td>Multi-Update Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Multi-Update Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.19</td> <td>Set Subtree Accessibility Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> - <td>1.3.6.1.4.1.30221.2.6.20</td> - <td>Get Subtree Accessibility Extended Request</td> - <td>UnboundID Directory Server</td> + <td>1.3.6.1.4.1.30221.2.6.22</td> + <td>Assured Replication Poll Extended Request</td> + <td>Ping Identity Directory Server</td> </tr> <tr> - <td>1.3.6.1.4.1.30221.2.6.21</td> - <td>Get Subtree Accessibility Extended Result</td> - <td>UnboundID Directory Server</td> + <td>1.3.6.1.4.1.30221.2.6.23</td> + <td>Assured Replication Poll Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.24</td> <td>Deliver One-Time Password Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.25</td> - <td>Deliver One-Time Password Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Deliver One-Time Password Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.26</td> <td>List Configurations Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.27</td> - <td>List Configurations Extended Result</td> - <td>UnboundID Directory Server</td> + <td>List Configurations Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.28</td> <td>Get Configuration Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.29</td> - <td>Get Configuration Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Get Configuration Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.30</td> <td>Get Backup Compatibility Descriptor Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.31</td> - <td>Get Backup Compatibility Descriptor Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Get Backup Compatibility Descriptor Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.32</td> <td>Identify Backup Compatibility Problems Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.33</td> - <td>Identify Backup Compatibility Problems Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Identify Backup Compatibility Problems Extended Response</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.6.34</td> + <td>Get Entries Request and Response Extended Operation</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.6.35</td> + <td>Get Entries Intermediate Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.36</td> <td>Set Notification Destination Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.37</td> <td>Delete Notification Destination Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.38</td> <td>Set Notification Subscription Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.39</td> <td>Delete Notification Subscription Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.40</td> <td>List Notification Subscriptions Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.41</td> - <td>List Notification Subscriptions Extended Result</td> - <td>UnboundID Directory Server</td> + <td>List Notification Subscriptions Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.42</td> <td>Clear Missed Notification Changes Alarm Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.43</td> <td>Get Password Quality Requirements Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.44</td> - <td>Get Password Quality Requirements Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Get Password Quality Requirements Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.45</td> <td>Deliver Password Reset Token Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.46</td> - <td>Deliver Password Reset Token Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Deliver Password Reset Token Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.47</td> <td>Get Supported OTP Delivery Mechanisms Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.48</td> - <td>Get Supported OTP Delivery Mechanisms Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Get Supported OTP Delivery Mechanisms Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.49</td> <td>Deliver Single-Use Token Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.50</td> - <td>Deliver Single-Use Token Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Deliver Single-Use Token Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.51</td> <td>Consume Single-Use Token Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.6.52</td> + <td>Synchronize Encryption Settings Extended Request</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.6.53</td> + <td>Synchronize Encryption Settings Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.54</td> <td>Register YubiKey OTP Device Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.55</td> <td>Deregister YubiKey OTP Device Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.56</td> <td>Generate TOTP Shared Secret Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.57</td> - <td>Generate TOTP Shared Secret Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Generate TOTP Shared Secret Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.58</td> <td>Revoke TOTP Shared Secret Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.6.59</td> + <td>Export Reversible Passwords Extended Request</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.6.60</td> + <td>Export Reversible Passwords Extended Response</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.6.61</td> + <td>Export Reversible Passwords Intermediate Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.62</td> <td>Generate Password Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.63</td> - <td>Generate Password Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Generate Password Extended Response</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.64</td> <td>Collect Support Data Extended Request</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.65</td> <td>Collect Support Data Output Intermediate Response</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.66</td> <td>Collect Support Data Archive Fragment Intermediate Response</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.6.67</td> - <td>Collect Support Data Extended Result</td> - <td>UnboundID Directory Server</td> + <td>Collect Support Data Extended Response</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.1</td> + <td><tt>access-control-disabled</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.2</td> + <td><tt>access-control-enabled</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.3</td> + <td><tt>access-control-parse-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.4</td> + <td><tt>cannot-acquire-shared-backend-lock</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.5</td> + <td><tt>cannot-copy-schema-files</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.6</td> + <td><tt>cannot-decode-entry</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.7</td> + <td><tt>cannot-find-recurring-task</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.8</td> + <td><tt>cannot-register-backend</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.9</td> + <td><tt>cannot-release-shared-backend-lock</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.10</td> + <td><tt>cannot-rename-current-task-file</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.11</td> + <td><tt>cannot-rename-new-task-file</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.12</td> + <td><tt>cannot-restore-backup</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.13</td> + <td><tt>cannot-schedule-recurring-task-iteration</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.14</td> + <td><tt>cannot-write-configuration</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.15</td> + <td><tt>cannot-write-new-schema-files</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.16</td> + <td><tt>cannot-write-task-backing-file</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.17</td> + <td><tt>duplicate-alerts-suppressed (deprecated)</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.18</td> + <td><tt>entering-lockdown-mode</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.19</td> + <td><tt>external-config-file-edit-handled</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.20</td> + <td><tt>external-config-file-edit-lost</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.21</td> + <td><tt>invalid-privilege</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.22</td> + <td><tt>je-recovery-required</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.23</td> + <td><tt>ldap-connection-handler-cannot-listen</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.24</td> + <td><tt>ldap-connection-handler-consecutive-failures</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.25</td> + <td><tt>ldap-connection-handler-uncaught-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.26</td> + <td><tt>ldif-backend-cannot-write</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.27</td> + <td><tt>ldif-connection-handler-parse-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.28</td> + <td><tt>ldif-connection-handler-io-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.29</td> + <td><tt>leaving-lockdown-mode</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.30</td> + <td><tt>logging-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.31</td> + <td><tt>replication-unresolved-conflict</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.32</td> + <td><tt>server-shutting-down</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.33</td> + <td><tt>server-started</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.34</td> + <td><tt>uncaught-exception</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.35</td> + <td><tt>unique-attribute-sync-conflict</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.36</td> + <td><tt>unique-attribute-sync-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.37</td> + <td><tt>user-defined-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.38</td> + <td><tt>user-defined-fatal</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.39</td> + <td><tt>user-defined-info</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.40</td> + <td><tt>user-defined-warning</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.41</td> + <td><tt>worker-thread-caught-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.42</td> + <td><tt>work-queue-full</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.43</td> + <td><tt>work-queue-no-threads-remaining</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.44</td> + <td><tt>do-not-use</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.45</td> + <td><tt>low-disk-space-warning</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.46</td> + <td><tt>low-disk-space-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.47</td> + <td><tt>out-of-disk-space-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.48</td> + <td><tt>cannot-write-server-state-file</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.49</td> + <td><tt>deadlock-detected</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.50</td> + <td><tt>work-queue-backlogged</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.51</td> + <td><tt>thread-exit-holding-lock</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.52</td> + <td><tt>replication-missing-changes</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.53</td> + <td><tt>replication-plugin-message-serialization-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.54</td> + <td><tt>replication-server-changelog-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.55</td> + <td><tt>health-check-available-to-degraded</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.56</td> + <td><tt>health-check-available-to-unavailable</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.57</td> + <td><tt>health-check-degraded-to-available</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.58</td> + <td><tt>health-check-degraded-to-unavailable</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.59</td> + <td><tt>health-check-unavailable-to-available</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.60</td> + <td><tt>health-check-unavailable-to-degraded</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.61</td> + <td><tt>proxy-entry-balancing-operation-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.62</td> + <td><tt>proxy-entry-balancing-error-multiple-operations-succeeded</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.63</td> + <td><tt>large-attribute-update-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.64</td> + <td><tt>access-log-criteria-matched</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.65</td> + <td><tt>replication-backlogged</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.66</td> + <td><tt>replication-monitor-data-unavailable</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.67</td> + <td><tt>lba-no-available-servers</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.68</td> + <td><tt>force-gc-starting</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.69</td> + <td><tt>force-gc-complete</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.70</td> + <td><tt>config-change</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.71</td> + <td><tt>sync-resource-connection-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.72</td> + <td><tt>sync-resource-operation-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.73</td> + <td><tt>access-control-change</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.74</td> + <td><tt>index-degraded</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.75</td> + <td><tt>index-rebuild-in-progress</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.76</td> + <td><tt>index-rebuild-completed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.77</td> + <td><tt>system-nanotime-stopped</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.78</td> + <td><tt>backend-initialization-failed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.79</td> + <td><tt>external-server-initialization-failed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.80</td> + <td><tt>unrecognized-alert-type</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.81</td> + <td><tt>replication-server-listen-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.82</td> + <td><tt>replication-replay-failed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.83</td> + <td><tt>sync-pipe-initialization-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.84</td> + <td><tt>server-starting</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.85</td> + <td><tt>server-jvm-paused</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.86</td> + <td><tt>unsupported-nested-group</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.87</td> + <td><tt>je-daemon-thread-exception</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.88</td> + <td><tt>replication-unsent-changes</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.89</td> + <td><tt>je-background-sync-failed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.90</td> + <td><tt>duplicate-fatal-alerts-suppressed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.91</td> + <td><tt>duplicate-error-alerts-suppressed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.92</td> + <td><tt>duplicate-warning-alerts-suppressed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.93</td> + <td><tt>duplicate-info-alerts-suppressed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.94</td> + <td><tt>backend-disabled</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.95</td> + <td><tt>sync-pipe-backlog-above-threshold</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.96</td> + <td><tt>sync-pipe-backlog-below-threshold</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.97</td> + <td><tt>offline-config-change-detected</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.98</td> + <td><tt>schema-checking-disabled</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.99</td> + <td><tt>system-current-time-shifted</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.100</td> + <td><tt>backup-failed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.101</td> + <td><tt>proxy-entry-rebalancing-admin-action-required</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.102</td> + <td><tt>restricted-subtree-accessibility</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.103</td> + <td><tt>threshold-warning-entry</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.104</td> + <td><tt>threshold-warning-exit</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.105</td> + <td><tt>threshold-critical-entry</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.106</td> + <td><tt>threshold-critical-exit</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.107</td> + <td><tt>replication-metadata-decode-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.108</td> + <td><tt>globally-unique-attribute-conflict</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.109</td> + <td><tt>global-referential-integrity-update-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.110</td> + <td><tt>index-corrupt</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.111</td> + <td><tt>third-party-extension-exception</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.112</td> + <td><tt>subtree-delete-interrupted</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.113</td> + <td><tt>broker-store-unavailable</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.114</td> + <td><tt>broker-store-available</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.115</td> + <td><tt>embedded-postgresql-unavailable</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.116</td> + <td><tt>exploded-index-background-delete-failed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.117</td> + <td><tt>exploded-index-background-delete-cleanup-failed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.118</td> + <td><tt>broker-store-version-incompatible</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.119</td> + <td><tt>do-not-use</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.120</td> + <td><tt>alarm-cleared</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.121</td> + <td><tt>alarm-warning</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.122</td> + <td><tt>alarm-minor</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.123</td> + <td><tt>alarm-major</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.124</td> + <td><tt>alarm-critical</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.125</td> + <td><tt>do-not-use</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.126</td> + <td><tt>global-index-insufficient-disk-space-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.127</td> + <td><tt>global-index-persistence-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.128</td> + <td><tt>global-index-read-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.129</td> + <td><tt>unindexed-internal-search</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.130</td> + <td><tt>je-cleaner-disabled</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.131</td> + <td><tt>mirrored-subtree-manager-operation-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.132</td> + <td><tt>mirrored-subtree-manager-no-master-found</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.133</td> + <td><tt>mirrored-subtree-manager-forced-as-master-warning</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.134</td> + <td><tt>mirrored-subtree-manager-forced-as-master-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.135</td> + <td><tt>mirrored-subtree-server-not-in-topology</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.136</td> + <td><tt>sensitive-trace-data-logged-warning</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.137</td> + <td><tt>failed-to-apply-mirrored-configuration</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.138</td> + <td><tt>je-environment-not-closed-cleanly</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.139</td> + <td><tt>crypto-manager-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.140</td> + <td><tt>debug-logging-enabled</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.141</td> + <td><tt>log-file-rotation-listener-invoke-error</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.142</td> + <td><tt>log-file-rotation-listener-processing-takes-too-long</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.143</td> + <td><tt>jvm-misconfiguration</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.144</td> + <td><tt>replication-generation-id-mismatch</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.145</td> + <td><tt>exporting-reversible-passwords</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.146</td> + <td><tt>restart-required</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.147</td> + <td><tt>key-near-index-entry-limit-alert</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.148</td> + <td><tt>key-exceeded-index-entry-limit-alert</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.149</td> + <td><tt>continuous-garbage-collection-detected</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.150</td> + <td><tt>unlicensed-product</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.151</td> + <td><tt>task-started</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.152</td> + <td><tt>task-completed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.153</td> + <td><tt>task-failed</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.154</td> + <td><tt>exec-task-launching-command</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.155</td> + <td><tt>file-retention-task-delete-failure</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.156</td> + <td><tt>http-connection-handler-duplicate-context-path</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.157</td> + <td><tt>http-connection-handler-duplicate-servlet-extension</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.158</td> + <td><tt>insecure-access-token-validator-enabled</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.159</td> + <td><tt>no-enabled-alert-handlers</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.160</td> + <td><tt>mirrored-subtree-manager-failed-outbound-connection</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.161</td> + <td><tt>mirrored-subtree-manager-connection-asymmetry</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.162</td> + <td><tt>missing-schema-elements-referenced-by-backend</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.163</td> + <td><tt>entry-references-removed-attribute-type</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.164</td> + <td><tt>delegated-admin-configuration-errors</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.165</td> + <td><tt>monitoring-endpoint-unable-to-connect</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.166</td> + <td><tt>pdp-unavailable</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.167</td> + <td><tt>pdp-trust-framework-version-deprecated</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.168</td> + <td><tt>console-logger-without-no-detach</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.169</td> + <td><tt>scim-lookthrough-limit-exceeded</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.170</td> + <td><tt>uniqueness-control-post-commit-conflict</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.171</td> + <td><tt>account-temporarily-locked-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.172</td> + <td><tt>account-permanently-locked-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.173</td> + <td><tt>account-unlocked-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.174</td> + <td><tt>account-idle-locked-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.175</td> + <td><tt>account-reset-locked-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.176</td> + <td><tt>account-disabled-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.177</td> + <td><tt>account-enabled-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.178</td> + <td><tt>account-not-yet-active-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.179</td> + <td><tt>account-expired-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.180</td> + <td><tt>password-expired-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.181</td> + <td><tt>password-expiring-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.182</td> + <td><tt>password-reset-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.183</td> + <td><tt>password-changed-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.184</td> + <td><tt>account-created-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.185</td> + <td><tt>account-updated-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.186</td> + <td><tt>bind-password-failed-validation-account-status-notification</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.187</td> + <td><tt>privilege-assigned</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.10.3.188</td> + <td><tt>insecure-request-rejected</tt> Administrative Alert</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.12.1</td> <td>Excluding Attributes from Search Result Entries Feature</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.12.2</td> <td>Subordinate Subtree Search Scope Feature</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.4.1.30221.2.12.3</td> <td>Changelog Attribute Indexing Feature</td> - <td>UnboundID Directory Server</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.12.4</td> + <td>Mirrored Subtree Digest Version 2 Feature</td> + <td>Ping Identity Directory Server</td> + </tr> + <tr> + <td>1.3.6.1.4.1.30221.2.12.5</td> + <td>Pass-Through Mirroring Feature</td> + <td>Ping Identity Directory Server</td> </tr> <tr> <td>1.3.6.1.5.5.7.9.1</td> <td><tt>dateOfBirth</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.3.6.1.5.5.7.9.2</td> <td><tt>placeOfBirth</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.3.6.1.5.5.7.9.3</td> <td><tt>gender</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.3.6.1.5.5.7.9.4</td> <td><tt>countryOfCitizenship</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.3.6.1.5.5.7.9.5</td> <td><tt>countryOfResidence</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>1.3.18.0.2.4.1107</td> <td><tt>printer-xri-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1108</td> <td><tt>printer-aliases</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1109</td> <td><tt>printer-charset-configured</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1110</td> <td><tt>printer-job-priority-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1111</td> <td><tt>printer-job-k-octets-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1112</td> <td><tt>printer-current-operator</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1113</td> <td><tt>printer-service-person</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1114</td> <td><tt>printer-delivery-orientation-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1115</td> <td><tt>printer-stacking-order-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1116</td> <td><tt>printer-output-features-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1117</td> <td><tt>printer-media-local-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1118</td> <td><tt>printer-copies-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1119</td> <td><tt>printer-natural-language-configured</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1120</td> <td><tt>printer-print-quality-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1121</td> <td><tt>printer-resolution-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1122</td> <td><tt>printer-media-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1123</td> <td><tt>printer-sides-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1124</td> <td><tt>printer-number-up-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1125</td> <td><tt>printer-finishings-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1126</td> <td><tt>printer-pages-per-minute-color</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1127</td> <td><tt>printer-pages-per-minute</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1128</td> <td><tt>printer-compression-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1129</td> <td><tt>printer-color-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1130</td> <td><tt>printer-document-format-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1131</td> <td><tt>printer-charset-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1132</td> <td><tt>printer-multiple-document-jobs-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1133</td> <td><tt>printer-ipp-versions-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1134</td> <td><tt>printer-more-info</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1135</td> <td><tt>printer-name</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1136</td> <td><tt>printer-location</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1137</td> <td><tt>printer-generated-natural-language-supported</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1138</td> <td><tt>printer-make-and-model</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1139</td> <td><tt>printer-info</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.4.1140</td> <td><tt>printer-uri</tt> Attribute Type</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.6.253</td> <td><tt>printerLPR</tt> Object Class</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.6.254</td> <td><tt>slpServicePrinter</tt> Object Class</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.6.255</td> <td><tt>printerService</tt> Object Class</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.6.256</td> <td><tt>printerIPP</tt> Object Class</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.6.257</td> <td><tt>printerServiceAuxClass</tt> Object Class</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>1.3.18.0.2.6.258</td> <td><tt>printerAbstract</tt> Object Class</td> - <td><a href="specs/rfc3712.txt" target="_blank">RFC 3712</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3712.txt" target="_blank">RFC 3712</a></td> </tr> <tr> <td>2.5.4.0</td> <td><tt>objectClass</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.4.1</td> <td><tt>aliasedObjectName</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.4.2</td> <td><tt>knowledgeInformation</tt> Attribute Type</td> - <td><a href="specs/rfc2256.txt" target="_blank">RFC 2256</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2256.txt" target="_blank">RFC 2256</a></td> </tr> <tr> <td>2.5.4.3</td> <td><tt>cn</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.4</td> <td><tt>sn</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.5</td> <td><tt>serialNumber</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.6</td> <td><tt>c</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.7</td> <td><tt>l</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.8</td> <td><tt>st</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.9</td> <td><tt>street</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.10</td> <td><tt>o</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.11</td> <td><tt>ou</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.12</td> <td><tt>title</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.13</td> <td><tt>description</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.14</td> <td><tt>searchGuide</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.15</td> <td><tt>businessCategory</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.16</td> <td><tt>postalAddress</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.17</td> <td><tt>postalCode</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.18</td> <td><tt>postOfficeBox</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.19</td> <td><tt>physicalDeliveryOfficeName</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.20</td> <td><tt>telephoneNumber</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.21</td> <td><tt>telexNumber</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.22</td> <td><tt>teletexTerminalIdentifier</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.23</td> <td><tt>facsimileTelephoneNumber</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.24</td> <td><tt>x121Address</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.25</td> <td><tt>internationaliSDNNumber</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.26</td> <td><tt>registeredAddress</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.27</td> <td><tt>destinationIndicator</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.28</td> <td><tt>preferredDeliveryMethod</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.29</td> <td><tt>presentationAddress</tt> Attribute Type</td> - <td><a href="specs/rfc2256.txt" target="_blank">RFC 2256</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2256.txt" target="_blank">RFC 2256</a></td> </tr> <tr> <td>2.5.4.30</td> <td><tt>supportedApplicationContext</tt> Attribute Type</td> - <td><a href="specs/rfc2256.txt" target="_blank">RFC 2256</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2256.txt" target="_blank">RFC 2256</a></td> </tr> <tr> <td>2.5.4.31</td> <td><tt>member</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.32</td> <td><tt>owner</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.33</td> <td><tt>roleOccupant</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.34</td> <td><tt>seeAlso</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.35</td> <td><tt>userPassword</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.36</td> <td><tt>userCertificate</tt> Attribute Type</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.4.37</td> <td><tt>cACertificate</tt> Attribute Type</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.4.38</td> <td><tt>authorityRevocationList</tt> Attribute Type</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.4.39</td> <td><tt>certificateRevocationList</tt> Attribute Type</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.4.40</td> <td><tt>crossCertificatePair</tt> Attribute Type</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.4.41</td> <td><tt>name</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.42</td> <td><tt>givenName</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.43</td> <td><tt>initials</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.44</td> <td><tt>generationQualifier</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.45</td> <td><tt>x500UniqueIdentifier</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.46</td> <td><tt>dnQualifier</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.47</td> <td><tt>enhancedSearchGuide</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.48</td> <td><tt>protocolInformation</tt> Attribute Type</td> - <td><a href="specs/rfc2256.txt" target="_blank">RFC 2256</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2256.txt" target="_blank">RFC 2256</a></td> </tr> <tr> <td>2.5.4.49</td> <td><tt>distinguishedName</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.50</td> <td><tt>uniqueMember</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.51</td> <td><tt>houseIdentifier</tt> Attribute Type</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.4.52</td> <td><tt>supportedAlgorithms</tt> Attribute Type</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.4.53</td> <td><tt>deltaRevocationList</tt> Attribute Type</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.4.54</td> <td><tt>dmdName</tt> Attribute Type</td> - <td><a href="specs/rfc2256.txt" target="_blank">RFC 2256</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2256.txt" target="_blank">RFC 2256</a></td> </tr> <tr> <td>2.5.4.65</td> <td><tt>pseudonym</tt> Attribute Type</td> - <td><a href="specs/rfc2985.txt" target="_blank">RFC 2985</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2985.txt" target="_blank">RFC 2985</a></td> </tr> <tr> <td>2.5.6.0</td> <td><tt>top</tt> Object Class</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.6.1</td> <td><tt>alias</tt> Object Class</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.6.2</td> <td><tt>country</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.3</td> <td><tt>locality</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.4</td> <td><tt>organization</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.5</td> <td><tt>organizationalUnit</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.6</td> <td><tt>person</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.7</td> <td><tt>organizationalPerson</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.8</td> <td><tt>organizationalRole</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.9</td> <td><tt>groupOfNames</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.10</td> <td><tt>residentialPerson</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.11</td> <td><tt>applicationProcess</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.12</td> <td><tt>applicationEntity</tt> Object Class</td> - <td><a href="specs/rfc2256.txt" target="_blank">RFC 2256</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2256.txt" target="_blank">RFC 2256</a></td> </tr> <tr> <td>2.5.6.13</td> <td><tt>dSA</tt> Object Class</td> - <td><a href="specs/rfc2256.txt" target="_blank">RFC 2256</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2256.txt" target="_blank">RFC 2256</a></td> </tr> <tr> <td>2.5.6.14</td> <td><tt>device</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.15</td> <td><tt>strongAuthenticationUser</tt> Object Class</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.6.16</td> <td><tt>certificationAuthority</tt> Object Class</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.6.16.2</td> <td><tt>certificationAuthority-V2</tt> Object Class</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.6.17</td> <td><tt>groupOfUniqueNames</tt> Object Class</td> - <td><a href="specs/rfc4519.txt" target="_blank">RFC 4519</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4519.txt" target="_blank">RFC 4519</a></td> </tr> <tr> <td>2.5.6.18</td> <td><tt>userSecurityInformation</tt> Object Class</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.6.19</td> <td><tt>cRLDistributionPoint</tt> Object Class</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.6.20</td> <td><tt>dmd</tt> Object Class</td> - <td><a href="specs/rfc2256.txt" target="_blank">RFC 2256</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2256.txt" target="_blank">RFC 2256</a></td> </tr> <tr> <td>2.5.6.21</td> <td><tt>pkiUser</tt> Object Class</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.6.22</td> <td><tt>pkiCA</tt> Object Class</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.6.23</td> <td><tt>deltaCRL</tt> Object Class</td> - <td><a href="specs/rfc4523.txt" target="_blank">RFC 4523</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4523.txt" target="_blank">RFC 4523</a></td> </tr> <tr> <td>2.5.13.0</td> <td><tt>objectIdentifierMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.1</td> <td><tt>distinguishedNameMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.2</td> <td><tt>caseIgnoreMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.3</td> <td><tt>caseIgnoreOrderingMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.4</td> <td><tt>caseIgnoreSubstringsMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.5</td> <td><tt>caseExactMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.6</td> <td><tt>caseExactOrderingMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.7</td> <td><tt>caseExactSubstringsMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.8</td> <td><tt>numericStringMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.9</td> <td><tt>numericStringOrderingMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.10</td> <td><tt>numericStringSubstringsMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.11</td> <td><tt>caseIgnoreListMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.12</td> <td><tt>caseIgnoreListSubstringsMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.13</td> <td><tt>booleanMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.14</td> <td><tt>integerMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.15</td> <td><tt>integerOrderingMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.16</td> <td><tt>bitStringMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.17</td> <td><tt>octetStringMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.18</td> <td><tt>octetStringOrderingMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + </tr> + <tr> + <td>2.5.13.19</td> + <td><tt>octetStringSubstringsMatch</tt> Matching Rule</td> + <td>X.520</td> </tr> <tr> <td>2.5.13.20</td> <td><tt>telephoneNumberMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.21</td> <td><tt>telephoneNumberSubstringsMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.23</td> <td><tt>uniqueMemberMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.27</td> <td><tt>generalizedTimeMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.28</td> <td><tt>generalizedTimeOrderingMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.29</td> <td><tt>integerFirstComponentMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.30</td> <td><tt>objectIdentifierFirstComponentMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.31</td> <td><tt>directoryStringFirstComponentMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.32</td> <td><tt>wordMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.13.33</td> <td><tt>keywordMatch</tt> Matching Rule</td> - <td><a href="specs/rfc4517.txt" target="_blank">RFC 4517</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4517.txt" target="_blank">RFC 4517</a></td> </tr> <tr> <td>2.5.18.1</td> <td><tt>createTimestamp</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.18.2</td> <td><tt>modifyTimestamp</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.18.3</td> <td><tt>creatorsName</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.18.4</td> <td><tt>modifiersName</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.18.9</td> @@ -3444,137 +4509,137 @@ <h2>LDAP OID Reference</h2> <tr> <td>2.5.18.10</td> <td><tt>subschemaSubentry</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.20.1</td> <td><tt>subschema</tt> Object Class</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.1</td> <td><tt>dITStructureRules</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.2</td> <td><tt>dITContentRules</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.4</td> <td><tt>matchingRules</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.5</td> <td><tt>attributeTypes</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.6</td> <td><tt>objectClasses</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.7</td> <td><tt>nameForms</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.8</td> <td><tt>matchingRuleUse</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.9</td> <td><tt>structuralObjectClass</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.5.21.10</td> <td><tt>governingStructureRule</tt> Attribute Type</td> - <td><a href="specs/rfc4512.txt" target="_blank">RFC 4512</a></td> + <td><a href="https://docs.ldap.com/specs/rfc4512.txt" target="_blank">RFC 4512</a></td> </tr> <tr> <td>2.16.840.1.113719.2.142.6.1.1</td> <td><tt>ldapSubEntry</tt> Object Class</td> - <td><a href="specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldup-subentry-08.txt" target="_blank">draft-ietf-ldup-subentry</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.1</td> <td><tt>carLicense</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.2</td> <td><tt>departmentNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.3</td> <td><tt>employeeNumber</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.4</td> <td><tt>employeeType</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.5</td> <td><tt>changeNumber</tt> Attribute Type</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.6</td> <td><tt>targetDN</tt> Attribute Type</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.7</td> <td><tt>changeType</tt> Attribute Type</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.8</td> <td><tt>changes</tt> Attribute Type</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.9</td> <td><tt>newRDN</tt> Attribute Type</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.10</td> <td><tt>deleteOldRDN</tt> Attribute Type</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.11</td> <td><tt>newSuperior</tt> Attribute Type</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.34</td> <td><tt>ref</tt> Attribute Type</td> - <td><a href="specs/rfc3296.txt" target="_blank">RFC 3296</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3296.txt" target="_blank">RFC 3296</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.35</td> <td><tt>changelog</tt> Attribute Type</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.39</td> <td><tt>preferredLanguage</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.40</td> <td><tt>userSMIMECertificate</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.55</td> @@ -3589,12 +4654,12 @@ <h2>LDAP OID Reference</h2> <tr> <td>2.16.840.1.113730.3.1.216</td> <td><tt>userPKCS12</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.241</td> <td><tt>displayName</tt> Attribute Type</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.1.542</td> @@ -3604,17 +4669,17 @@ <h2>LDAP OID Reference</h2> <tr> <td>2.16.840.1.113730.3.2.1</td> <td><tt>changeLogEntry</tt> Object Class</td> - <td><a href="specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> + <td><a href="https://docs.ldap.com/specs/draft-good-ldap-changelog-04.txt" target="_blank">draft-good-ldap-changelog</a></td> </tr> <tr> <td>2.16.840.1.113730.3.2.2</td> <td><tt>inetOrgPerson</tt> Object Class</td> - <td><a href="specs/rfc2798.txt" target="_blank">RFC 2798</a></td> + <td><a href="https://docs.ldap.com/specs/rfc2798.txt" target="_blank">RFC 2798</a></td> </tr> <tr> <td>2.16.840.1.113730.3.2.6</td> <td><tt>referral</tt> Object Class</td> - <td><a href="specs/rfc3296.txt" target="_blank">RFC 3296</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3296.txt" target="_blank">RFC 3296</a></td> </tr> <tr> <td>2.16.840.1.113730.3.2.33</td> @@ -3624,52 +4689,52 @@ <h2>LDAP OID Reference</h2> <tr> <td>2.16.840.1.113730.3.4.2</td> <td>ManageDsaIT Request Control</td> - <td><a href="specs/rfc3296.txt" target="_blank">RFC 3296</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3296.txt" target="_blank">RFC 3296</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.3</td> <td>Persistent Search Request Control</td> - <td><a href="specs/draft-ietf-ldapext-psearch-03.txt" target="_blank">draft-ietf-ldapext-psearch</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldapext-psearch-03.txt" target="_blank">draft-ietf-ldapext-psearch</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.4</td> <td>Password Expired Response Control</td> - <td><a href="specs/draft-vchu-ldap-pwd-policy-00.txt" target="_blank">draft-vchu-ldap-pwd-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-vchu-ldap-pwd-policy-00.txt" target="_blank">draft-vchu-ldap-pwd-policy</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.5</td> <td>Password Expiring Response Control</td> - <td><a href="specs/draft-vchu-ldap-pwd-policy-00.txt" target="_blank">draft-vchu-ldap-pwd-policy</a></td> + <td><a href="https://docs.ldap.com/specs/draft-vchu-ldap-pwd-policy-00.txt" target="_blank">draft-vchu-ldap-pwd-policy</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.7</td> <td>Entry Change Notification Response Control</td> - <td><a href="specs/draft-ietf-ldapext-psearch-03.txt" target="_blank">draft-ietf-ldapext-psearch</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldapext-psearch-03.txt" target="_blank">draft-ietf-ldapext-psearch</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.9</td> <td>Virtual List View Request Control</td> - <td><a href="specs/draft-ietf-ldapext-ldapv3-vlv-09.txt" target="_blank">draft-ietf-ldapext-ldapv3-vlv</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldapext-ldapv3-vlv-09.txt" target="_blank">draft-ietf-ldapext-ldapv3-vlv</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.10</td> <td>Virtual List View Response Control</td> - <td><a href="specs/draft-ietf-ldapext-ldapv3-vlv-09.txt" target="_blank">draft-ietf-ldapext-ldapv3-vlv</a></td> + <td><a href="https://docs.ldap.com/specs/draft-ietf-ldapext-ldapv3-vlv-09.txt" target="_blank">draft-ietf-ldapext-ldapv3-vlv</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.12</td> - <td>Proxied Authorization Request Control (v1)</td> - <td><a href="specs/draft-weltman-ldapv3-proxy-04.txt" target="_blank">draft-weltman-ldapv3-proxy</a></td> + <td>Proxied Authorization (v1) Request Control</td> + <td><a href="https://docs.ldap.com/specs/draft-weltman-ldapv3-proxy-04.txt" target="_blank">draft-weltman-ldapv3-proxy</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.15</td> <td>Authorization Identity Response Control</td> - <td><a href="specs/rfc3829.txt" target="_blank">RFC 3829</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3829.txt" target="_blank">RFC 3829</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.16</td> <td>Authorization Identity Request Control</td> - <td><a href="specs/rfc3829.txt" target="_blank">RFC 3829</a></td> + <td><a href="https://docs.ldap.com/specs/rfc3829.txt" target="_blank">RFC 3829</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.17</td> @@ -3678,8 +4743,8 @@ <h2>LDAP OID Reference</h2> </tr> <tr> <td>2.16.840.1.113730.3.4.18</td> - <td>Proxied Authorization Request Control (v2)</td> - <td><a href="specs/rfc4370.txt" target="_blank">RFC 4370</a></td> + <td>Proxied Authorization (v2) Request Control</td> + <td><a href="https://docs.ldap.com/specs/rfc4370.txt" target="_blank">RFC 4370</a></td> </tr> <tr> <td>2.16.840.1.113730.3.4.19</td> diff --git a/resource/oid-registry.json b/resource/oid-registry.json index b570dbc1..c4c6882c 100644 --- a/resource/oid-registry.json +++ b/resource/oid-registry.json @@ -96,8 +96,8 @@ { "oid":"1.2.840.113556.1.4.484", "name":"calOtherCAPURIs", "type":"Attribute Type", "origin":"RFC 2739", "url":"https://docs.ldap.com/specs/rfc2739.txt" } { "oid":"1.2.840.113556.1.4.485", "name":"calOtherCalAdrURIs", "type":"Attribute Type", "origin":"RFC 2739", "url":"https://docs.ldap.com/specs/rfc2739.txt" } { "oid":"1.2.840.113556.1.4.805", "name":"Tree Delete", "type":"Request Control", "origin":"draft-armijo-ldap-treedelete", "url":"https://docs.ldap.com/specs/draft-armijo-ldap-treedelete-02.txt" } -{ "oid":"1.2.840.113556.1.4.841", "name":"DirSync", "type":"Request Control", "origin":"Active Directory" } -{ "oid":"1.2.840.113556.1.4.1413", "name":"Permissive Modify", "type":"Request Control", "origin":"Active Directory" } +{ "oid":"1.2.840.113556.1.4.841", "name":"DirSync", "type":"Request Control", "origin":"Microsoft Active Directory" } +{ "oid":"1.2.840.113556.1.4.1413", "name":"Permissive Modify", "type":"Request Control", "origin":"Microsoft Active Directory" } { "oid":"1.2.840.113556.1.4.1504", "name":"Attribute Scoped Query", "type":"Request Control", "origin":"draft-kashi-attr-scoped-query", "url":"https://docs.ldap.com/specs/draft-kashi-attr-scoped-query-01.txt" } { "oid":"1.2.840.113556.1.5.87", "name":"calEntry", "type":"Object Class", "origin":"RFC 2739", "url":"https://docs.ldap.com/specs/rfc2739.txt" } { "oid":"1.3.6.1.1.1.1.0", "name":"uidNumber", "type":"Attribute Type", "origin":"RFC 2307", "url":"https://docs.ldap.com/specs/rfc2307.txt" } @@ -214,9 +214,9 @@ { "oid":"1.3.6.1.1.10.6.9", "name":"uddiv3Subscription", "type":"Object Class", "origin":"RFC 4403", "url":"https://docs.ldap.com/specs/rfc4403.txt" } { "oid":"1.3.6.1.1.10.6.10", "name":"uddiv3EntityObituary", "type":"Object Class", "origin":"RFC 4403", "url":"https://docs.ldap.com/specs/rfc4403.txt" } { "oid":"1.3.6.1.1.12", "name":"LDAP Assertion", "type":"Request Control", "origin":"RFC 4528", "url":"https://docs.ldap.com/specs/rfc4528.txt" } -{ "oid":"1.3.6.1.1.13.1", "name":"LDAP Pre-Read Request and", "type":"Response Control", "origin":"RFC 4527", "url":"https://docs.ldap.com/specs/rfc4527.txt" } -{ "oid":"1.3.6.1.1.13.2", "name":"LDAP Post-Read Request and", "type":"Response Control", "origin":"RFC 4527", "url":"https://docs.ldap.com/specs/rfc4527.txt" } -{ "oid":"1.3.6.1.1.14", "name":"LDAP Modify-Increment Extension Feature", "origin":"RFC 4525", "url":"https://docs.ldap.com/specs/rfc4525.txt" } +{ "oid":"1.3.6.1.1.13.1", "name":"LDAP Pre-Read Request and Response", "type":"Control", "origin":"RFC 4527", "url":"https://docs.ldap.com/specs/rfc4527.txt" } +{ "oid":"1.3.6.1.1.13.2", "name":"LDAP Post-Read Request and Response", "type":"Control", "origin":"RFC 4527", "url":"https://docs.ldap.com/specs/rfc4527.txt" } +{ "oid":"1.3.6.1.1.14", "name":"LDAP Modify-Increment Extension Feature", "type":"Feature", "origin":"RFC 4525", "url":"https://docs.ldap.com/specs/rfc4525.txt" } { "oid":"1.3.6.1.1.16.4", "name":"entryUUID", "type":"Attribute Type", "origin":"RFC 4530", "url":"https://docs.ldap.com/specs/rfc4530.txt" } { "oid":"1.3.6.1.1.17.1", "name":"Start LBURP (LDAP Bulk Update/Replication Protocol)", "type":"Extended Request", "origin":"RFC 4373", "url":"https://docs.ldap.com/specs/rfc4373.txt" } { "oid":"1.3.6.1.1.17.2", "name":"Start LBURP (LDAP Bulk Update/Replication Protocol)", "type":"Extended Response", "origin":"RFC 4373", "url":"https://docs.ldap.com/specs/rfc4373.txt" } @@ -224,13 +224,13 @@ { "oid":"1.3.6.1.1.17.4", "name":"End LBURP (LDAP Bulk Update/Replication Protocol)", "type":"Extended Response", "origin":"RFC 4373", "url":"https://docs.ldap.com/specs/rfc4373.txt" } { "oid":"1.3.6.1.1.17.5", "name":"LBURP (LDAP Bulk Update/Replication Protocol) Update", "type":"Extended Response", "origin":"RFC 4373", "url":"https://docs.ldap.com/specs/rfc4373.txt" } { "oid":"1.3.6.1.1.17.6", "name":"LBURP (LDAP Bulk Update/Replication Protocol) Update", "type":"Extended Request", "origin":"RFC 4373", "url":"https://docs.ldap.com/specs/rfc4373.txt" } -{ "oid":"1.3.6.1.1.17.7", "name":"LBURP (LDAP Bulk Update/Replication Protocol) Incremental Update Style", "origin":"RFC 4373", "url":"https://docs.ldap.com/specs/rfc4373.txt" } +{ "oid":"1.3.6.1.1.17.7", "name":"LBURP (LDAP Bulk Update/Replication Protocol) Incremental Update Style", "type":"LBURP Update Style", "origin":"RFC 4373", "url":"https://docs.ldap.com/specs/rfc4373.txt" } { "oid":"1.3.6.1.1.19", "name":"LDAP Turn", "type":"Extended Request", "origin":"RFC 4531", "url":"https://docs.ldap.com/specs/rfc4531.txt" } { "oid":"1.3.6.1.1.20", "name":"entryDN", "type":"Attribute Type", "origin":"RFC 5020", "url":"https://docs.ldap.com/specs/rfc5020.txt" } { "oid":"1.3.6.1.1.21.1", "name":"Start Transaction", "type":"Extended Request", "origin":"RFC 5805", "url":"https://docs.ldap.com/specs/rfc5805.txt" } { "oid":"1.3.6.1.1.21.2", "name":"Transaction Specification", "type":"Request Control", "origin":"RFC 5805", "url":"https://docs.ldap.com/specs/rfc5805.txt" } { "oid":"1.3.6.1.1.21.3", "name":"End Transaction", "type":"Extended Request", "origin":"RFC 5805", "url":"https://docs.ldap.com/specs/rfc5805.txt" } -{ "oid":"1.3.6.1.1.21.4", "name":"Aborted Transaction Unsolicited Notification", "origin":"RFC 5805", "url":"https://docs.ldap.com/specs/rfc5805.txt" } +{ "oid":"1.3.6.1.1.21.4", "name":"Aborted Transaction", "type":"Unsolicited Notification", "origin":"RFC 5805", "url":"https://docs.ldap.com/specs/rfc5805.txt" } { "oid":"1.3.6.1.1.22", "name":"LDAP Don’t Use Copy", "type":"Control", "origin":"RFC 6171", "url":"https://docs.ldap.com/specs/rfc6171.txt" } { "oid":"1.3.6.1.4.1.42.2.27.4.1.6", "name":"javaClassName", "type":"Attribute Type", "origin":"RFC 2713", "url":"https://docs.ldap.com/specs/rfc2713.txt" } { "oid":"1.3.6.1.4.1.42.2.27.4.1.7", "name":"javaCodebase", "type":"Attribute Type", "origin":"RFC 2713", "url":"https://docs.ldap.com/specs/rfc2713.txt" } @@ -272,12 +272,12 @@ { "oid":"1.3.6.1.4.1.42.2.27.8.1.22", "name":"pwdReset", "type":"Attribute Type", "origin":"draft-behera-ldap-password-policy", "url":"https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" } { "oid":"1.3.6.1.4.1.42.2.27.8.1.23", "name":"pwdPolicySubentry", "type":"Attribute Type", "origin":"draft-behera-ldap-password-policy", "url":"https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" } { "oid":"1.3.6.1.4.1.42.2.27.8.2.1", "name":"pwdPolicy", "type":"Object Class", "origin":"draft-behera-ldap-password-policy", "url":"https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" } -{ "oid":"1.3.6.1.4.1.42.2.27.8.5.1", "name":"Password Policy Request and", "type":"Response Control", "origin":"draft-behera-ldap-password-policy", "url":"https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" } +{ "oid":"1.3.6.1.4.1.42.2.27.8.5.1", "name":"Password Policy Request and Response", "type":"Control", "origin":"draft-behera-ldap-password-policy", "url":"https://docs.ldap.com/specs/draft-behera-ldap-password-policy-10.txt" } { "oid":"1.3.6.1.4.1.42.2.27.9.1.39", "name":"aclRights", "type":"Attribute Type", "origin":"Sun Java System Directory Server" } { "oid":"1.3.6.1.4.1.42.2.27.9.1.40", "name":"aclRightsInfo", "type":"Attribute Type", "origin":"Sun Java System Directory Server" } { "oid":"1.3.6.1.4.1.42.2.27.9.1.792", "name":"isMemberOf", "type":"Attribute Type", "origin":"Sun Java System Directory Server" } { "oid":"1.3.6.1.4.1.42.2.27.9.5.2", "name":"Get Effective Rights", "type":"Request Control", "origin":"Sun Java System Directory Server" } -{ "oid":"1.3.6.1.4.1.42.2.27.9.5.8", "name":"Account Usable Request and", "type":"Response Control", "origin":"Sun Java System Directory Server" } +{ "oid":"1.3.6.1.4.1.42.2.27.9.5.8", "name":"Account Usable Request and Response", "type":"Control", "origin":"Sun Java System Directory Server" } { "oid":"1.3.6.1.4.1.250.1.41", "name":"labeledURL", "type":"Attribute Type", "origin":"RFC 2079", "url":"https://docs.ldap.com/specs/rfc2079.txt" } { "oid":"1.3.6.1.4.1.250.1.57", "name":"labeledURI", "type":"Attribute Type", "origin":"RFC 2079", "url":"https://docs.ldap.com/specs/rfc2079.txt" } { "oid":"1.3.6.1.4.1.250.3.15", "name":"labeledURIObject", "type":"Object Class", "origin":"RFC 2079", "url":"https://docs.ldap.com/specs/rfc2079.txt" } @@ -329,7 +329,7 @@ { "oid":"1.3.6.1.4.1.1466.115.121.1.54", "name":"LDAP Syntax Description", "type":"Attribute Syntax", "origin":"RFC 4517", "url":"https://docs.ldap.com/specs/rfc4517.txt" } { "oid":"1.3.6.1.4.1.1466.115.121.1.58", "name":"Substring Assertion", "type":"Attribute Syntax", "origin":"RFC 4517", "url":"https://docs.ldap.com/specs/rfc4517.txt" } { "oid":"1.3.6.1.4.1.1466.344", "name":"dcObject", "type":"Object Class", "origin":"RFC 4519", "url":"https://docs.ldap.com/specs/rfc4519.txt" } -{ "oid":"1.3.6.1.4.1.1466.20036", "name":"Notice of Disconnection Unsolicited Notification", "origin":"RFC 4511", "url":"https://docs.ldap.com/specs/rfc4511.txt" } +{ "oid":"1.3.6.1.4.1.1466.20036", "name":"Notice of Disconnection", "type":"Unsolicited Notification", "origin":"RFC 4511", "url":"https://docs.ldap.com/specs/rfc4511.txt" } { "oid":"1.3.6.1.4.1.1466.20037", "name":"StartTLS", "type":"Extended Request", "origin":"RFC 4511", "url":"https://docs.ldap.com/specs/rfc4511.txt" } { "oid":"1.3.6.1.4.1.1466.29539.10", "name":"LDAP Triggered Search", "type":"Request Control", "origin":"draft-ietf-ldapext-trigger", "url":"https://docs.ldap.com/specs/draft-ietf-ldapext-trigger-01.txt" } { "oid":"1.3.6.1.4.1.1466.29539.10.1", "name":"dnSubordinateTo", "type":"Matching Rule", "origin":"draft-ietf-ldapext-trigger", "url":"https://docs.ldap.com/specs/draft-ietf-ldapext-trigger-01.txt" } @@ -338,13 +338,13 @@ { "oid":"1.3.6.1.4.1.4203.1.3.4", "name":"authPassword", "type":"Attribute Type", "origin":"RFC 3112", "url":"https://docs.ldap.com/specs/rfc3112.txt" } { "oid":"1.3.6.1.4.1.4203.1.3.5", "name":"supportedFeatures", "type":"Attribute Type", "origin":"RFC 4512", "url":"https://docs.ldap.com/specs/rfc4512.txt" } { "oid":"1.3.6.1.4.1.4203.1.4.7", "name":"authPasswordObject", "type":"Object Class", "origin":"RFC 3112", "url":"https://docs.ldap.com/specs/rfc3112.txt" } -{ "oid":"1.3.6.1.4.1.4203.1.5.1", "name":"All Operational Attributes Feature", "origin":"RFC 3673", "url":"https://docs.ldap.com/specs/rfc3673.txt" } +{ "oid":"1.3.6.1.4.1.4203.1.5.1", "name":"All Operational Attributes", "type":"Feature", "origin":"RFC 3673", "url":"https://docs.ldap.com/specs/rfc3673.txt" } { "oid":"1.3.6.1.4.1.4203.1.5.2", "name":"Requesting Attributes by", "type":"Object Class", "origin":"RFC 4529", "url":"https://docs.ldap.com/specs/rfc4529.txt" } -{ "oid":"1.3.6.1.4.1.4203.1.5.3", "name":"LDAP Absolute True and False Filters Feature", "origin":"RFC 4526", "url":"https://docs.ldap.com/specs/rfc4526.txt" } +{ "oid":"1.3.6.1.4.1.4203.1.5.3", "name":"LDAP Absolute True and False Filters", "type":"Feature", "origin":"RFC 4526", "url":"https://docs.ldap.com/specs/rfc4526.txt" } { "oid":"1.3.6.1.4.1.4203.1.9.1.1", "name":"LDAP Content Synchronization", "type":"Request Control", "origin":"RFC 4533", "url":"https://docs.ldap.com/specs/rfc4533.txt" } { "oid":"1.3.6.1.4.1.4203.1.9.1.2", "name":"LDAP Content Synchronization State", "type":"Control", "origin":"RFC 4533", "url":"https://docs.ldap.com/specs/rfc4533.txt" } { "oid":"1.3.6.1.4.1.4203.1.9.1.3", "name":"LDAP Content Synchronization Done", "type":"Control", "origin":"RFC 4533", "url":"https://docs.ldap.com/specs/rfc4533.txt" } -{ "oid":"1.3.6.1.4.1.4203.1.9.1.4", "name":"LDAP Content Synchronization Info Intermediate Response", "origin":"RFC 4533", "url":"https://docs.ldap.com/specs/rfc4533.txt" } +{ "oid":"1.3.6.1.4.1.4203.1.9.1.4", "name":"LDAP Content Synchronization Info", "type":"Intermediate Response", "origin":"RFC 4533", "url":"https://docs.ldap.com/specs/rfc4533.txt" } { "oid":"1.3.6.1.4.1.4203.1.10.1", "name":"LDAP Subentries", "type":"Request Control", "origin":"RFC 3672", "url":"https://docs.ldap.com/specs/rfc3672.txt" } { "oid":"1.3.6.1.4.1.4203.1.10.2", "name":"LDAP No-Op", "type":"Request Control", "origin":"draft-zeilenga-ldap-noop", "url":"https://docs.ldap.com/specs/draft-zeilenga-ldap-noop-12.txt" } { "oid":"1.3.6.1.4.1.4203.1.11.1", "name":"Password Modify", "type":"Extended Request", "origin":"RFC 3062", "url":"https://docs.ldap.com/specs/rfc3062.txt" } @@ -414,11 +414,11 @@ { "oid":"1.3.6.1.4.1.30221.2.4.16", "name":"jsonObjectCaseInsensitiveNamesCaseSensitiveValues", "type":"Matching Rule", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.4.17", "name":"jsonObjectCaseInsensitiveNamesCaseInsensitiveValues", "type":"Matching Rule", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.1", "name":"Batched Transaction Specification", "type":"Request Control", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.5.2", "name":"Intermediate Client Request and", "type":"Response Control", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.5.2", "name":"Intermediate Client Request and Response", "type":"Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.3", "name":"Retain Identity", "type":"Request Control", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.5.4", "name":"Interactive Transaction Specification Request and", "type":"Response Control", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.5.4", "name":"Interactive Transaction Specification Request and Response", "type":"Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.5", "name":"Ignore NO-USER-MODIFICATION", "type":"Request Control", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.5.6", "name":"Get Authorization Entry Request and", "type":"Response Control", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.5.6", "name":"Get Authorization Entry Request and Response", "type":"Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.7", "name":"Unsolicited Cancel", "type":"Response Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.8", "name":"Connection Closed", "type":"Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.9", "name":"Join Request and Result", "type":"Control", "origin":"Ping Identity Directory Server" } @@ -462,7 +462,7 @@ { "oid":"1.3.6.1.4.1.30221.2.5.47", "name":"Get Password Policy State Issues", "type":"Response Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.48", "name":"Proxied MS-CHAPv2 Details", "type":"Request Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.49", "name":"Return OTP", "type":"Request Control", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.5.50", "name":"Return OTP", "type":"Request Control", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.5.50", "name":"Return OTP", "type":"Response Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.51", "name":"Password Update Behavior", "type":"Request Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.52", "name":"Uniqueness", "type":"Request Control", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.5.53", "name":"Uniqueness", "type":"Response Control", "origin":"Ping Identity Directory Server" } @@ -479,14 +479,14 @@ { "oid":"1.3.6.1.4.1.30221.2.6.2", "name":"End Batched Transaction", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.3", "name":"Start Interactive Transaction", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.4", "name":"End Interactive Transaction", "type":"Extended Request", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.5", "name":"Interactive Transaction Aborted Unsolicited Notification", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.6.5", "name":"Interactive Transaction Aborted", "type":"Unsolicited Notification", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.6", "name":"Stream Directory Values", "type":"Extended Request", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.7", "name":"Stream Directory Values Intermediate Response", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.6.7", "name":"Stream Directory Values", "type":"Intermediate Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.8", "name":"Stream Proxy Values", "type":"Extended Request", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.9", "name":"Stream Proxy Values Intermediate Response", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.6.9", "name":"Stream Proxy Values", "type":"Intermediate Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.10", "name":"Get Changelog Batch", "type":"Extended Request", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.11", "name":"Changelog Entry Intermediate Response", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.12", "name":"Missing Changelog Entries Intermediate Response", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.6.11", "name":"Changelog Entry", "type":"Intermediate Response", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.6.12", "name":"Missing Changelog Entries", "type":"Intermediate Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.13", "name":"Start Administrative Session", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.14", "name":"End Administrative Session", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.15", "name":"Validate TOTP Password", "type":"Extended Request", "origin":"Ping Identity Directory Server" } @@ -494,8 +494,8 @@ { "oid":"1.3.6.1.4.1.30221.2.6.17", "name":"Multi-Update", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.18", "name":"Multi-Update", "type":"Extended Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.19", "name":"Set Subtree Accessibility", "type":"Extended Request", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.20", "name":"Get Subtree Accessibility", "type":"Extended Request", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.21", "name":"Get Subtree Accessibility", "type":"Extended Response", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.1.6.20", "name":"Get Subtree Accessibility", "type":"Extended Request", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.1.6.21", "name":"Get Subtree Accessibility", "type":"Extended Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.22", "name":"Assured Replication Poll", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.23", "name":"Assured Replication Poll", "type":"Extended Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.24", "name":"Deliver One-Time Password", "type":"Extended Request", "origin":"Ping Identity Directory Server" } @@ -508,7 +508,7 @@ { "oid":"1.3.6.1.4.1.30221.2.6.31", "name":"Get Backup Compatibility Descriptor", "type":"Extended Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.32", "name":"Identify Backup Compatibility Problems", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.33", "name":"Identify Backup Compatibility Problems", "type":"Extended Response", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.34", "name":"Get Entries Extended Request and", "type":"Extended Response", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.6.34", "name":"Get Entries Request and Response", "type":"Extended Operation", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.35", "name":"Get Entries", "type":"Intermediate Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.36", "name":"Set Notification Destination", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.37", "name":"Delete Notification Destination", "type":"Extended Request", "origin":"Ping Identity Directory Server" } @@ -539,8 +539,8 @@ { "oid":"1.3.6.1.4.1.30221.2.6.62", "name":"Generate Password", "type":"Extended Request", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.63", "name":"Generate Password", "type":"Extended Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.64", "name":"Collect Support Data", "type":"Extended Request", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.65", "name":"Collect Support Data Output Intermediate Response", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.6.66", "name":"Collect Support Data Archive Fragment Intermediate Response", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.6.65", "name":"Collect Support Data Output", "type":"Intermediate Response", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.6.66", "name":"Collect Support Data Archive Fragment", "type":"Intermediate Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.6.67", "name":"Collect Support Data", "type":"Extended Response", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.10.3.1", "name":"access-control-disabled", "type":"Administrative Alert", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.10.3.2", "name":"access-control-enabled", "type":"Administrative Alert", "origin":"Ping Identity Directory Server" } @@ -730,9 +730,9 @@ { "oid":"1.3.6.1.4.1.30221.2.10.3.186", "name":"bind-password-failed-validation-account-status-notification", "type":"Administrative Alert", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.10.3.187", "name":"privilege-assigned", "type":"Administrative Alert", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.10.3.188", "name":"insecure-request-rejected", "type":"Administrative Alert", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.12.1", "name":"Excluding Attributes from Search Result Entries Feature", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.12.2", "name":"Subordinate Subtree Search Scope Feature", "origin":"Ping Identity Directory Server" } -{ "oid":"1.3.6.1.4.1.30221.2.12.3", "name":"Changelog Attribute Indexing Feature", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.12.1", "name":"Excluding Attributes from Search Result Entries", "type":"Feature", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.12.2", "name":"Subordinate Subtree Search Scope", "type":"Feature", "origin":"Ping Identity Directory Server" } +{ "oid":"1.3.6.1.4.1.30221.2.12.3", "name":"Changelog Attribute Indexing", "type":"Feature", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.12.4", "name":"Mirrored Subtree Digest Version 2", "type":"Feature", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.4.1.30221.2.12.5", "name":"Pass-Through Mirroring", "type":"Feature", "origin":"Ping Identity Directory Server" } { "oid":"1.3.6.1.5.5.7.9.1", "name":"dateOfBirth", "type":"Attribute Type", "origin":"RFC 2985", "url":"https://docs.ldap.com/specs/rfc2985.txt" } @@ -880,6 +880,7 @@ { "oid":"2.5.13.16", "name":"bitStringMatch", "type":"Matching Rule", "origin":"RFC 4517", "url":"https://docs.ldap.com/specs/rfc4517.txt" } { "oid":"2.5.13.17", "name":"octetStringMatch", "type":"Matching Rule", "origin":"RFC 4517", "url":"https://docs.ldap.com/specs/rfc4517.txt" } { "oid":"2.5.13.18", "name":"octetStringOrderingMatch", "type":"Matching Rule", "origin":"RFC 4517", "url":"https://docs.ldap.com/specs/rfc4517.txt" } +{ "oid":"2.5.13.19", "name":"octetStringSubstringsMatch", "type":"Matching Rule", "origin":"X.520" } { "oid":"2.5.13.20", "name":"telephoneNumberMatch", "type":"Matching Rule", "origin":"RFC 4517", "url":"https://docs.ldap.com/specs/rfc4517.txt" } { "oid":"2.5.13.21", "name":"telephoneNumberSubstringsMatch", "type":"Matching Rule", "origin":"RFC 4517", "url":"https://docs.ldap.com/specs/rfc4517.txt" } { "oid":"2.5.13.23", "name":"uniqueMemberMatch", "type":"Matching Rule", "origin":"RFC 4517", "url":"https://docs.ldap.com/specs/rfc4517.txt" } diff --git a/src/com/unboundid/ldap/sdk/unboundidds/tools/LDAPPasswordModify.java b/src/com/unboundid/ldap/sdk/unboundidds/tools/LDAPPasswordModify.java index c99183b7..17ffaf41 100644 --- a/src/com/unboundid/ldap/sdk/unboundidds/tools/LDAPPasswordModify.java +++ b/src/com/unboundid/ldap/sdk/unboundidds/tools/LDAPPasswordModify.java @@ -296,7 +296,8 @@ /** * The OID base that has been assigned to Microsoft. */ - @NotNull private static final String MICROSOFT_BASE_OID = "1.2.840.113556"; + @NotNull private static final String MICROSOFT_BASE_OBJECT_IDENTIFIER = + "1.2.840.113556"; @@ -1500,7 +1501,7 @@ private String getPasswordUpdateMethod(@NotNull final LDAPConnectionPool pool) int numMicrosoftControlsSupported = 0; for (final String oid : rootDSE.getSupportedControlOIDs()) { - if (oid.startsWith(MICROSOFT_BASE_OID + '.')) + if (oid.startsWith(MICROSOFT_BASE_OBJECT_IDENTIFIER + '.')) { numMicrosoftControlsSupported++; } @@ -1512,7 +1513,8 @@ private String getPasswordUpdateMethod(@NotNull final LDAPConnectionPool pool) { wrapOut(0, WRAP_COLUMN, INFO_PWMOD_SELECTING_AD_METHOD_CONTROL_COUNT.get( - numMicrosoftControlsSupported, MICROSOFT_BASE_OID)); + numMicrosoftControlsSupported, + MICROSOFT_BASE_OBJECT_IDENTIFIER)); } return PASSWORD_CHANGE_METHOD_AD; diff --git a/tests/unit/src/com/unboundid/util/OIDRegistryTestCase.java b/tests/unit/src/com/unboundid/util/OIDRegistryTestCase.java index 844e3b2f..4d3544e1 100644 --- a/tests/unit/src/com/unboundid/util/OIDRegistryTestCase.java +++ b/tests/unit/src/com/unboundid/util/OIDRegistryTestCase.java @@ -38,11 +38,21 @@ import java.io.File; +import java.io.FileInputStream; +import java.io.PrintWriter; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.security.MessageDigest; +import java.util.ArrayList; +import java.util.List; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import com.unboundid.ldap.sdk.LDAPSDKTestCase; import com.unboundid.ldap.sdk.schema.Schema; +import com.unboundid.util.json.JSONObject; +import com.unboundid.util.json.JSONObjectReader; @@ -198,4 +208,405 @@ public void testRegistryWithSchema() assertNull(registry.get("1.2.3.4.5").getOrigin()); assertNull(registry.get("1.2.3.4.5").getURL()); } + + + + /** + * Examines the contents of the oid-registry.json file and ensures that all + * of the definitions it contains are found in the default OID registry. + * + * @throws Exception If an unexpected problem occurs. + */ + @Test() + public void testOIDRegistryJSONFile() + throws Exception + { + final OIDRegistry oidRegistry = OIDRegistry.getDefault(); + assertNotNull(oidRegistry); + + final File baseDir = new File(System.getProperty("basedir")); + final File resourceDir = new File(baseDir, "resource"); + final File registryFile = new File(resourceDir, "oid-registry.json"); + + final List<JSONObject> missingObjects = new ArrayList<>(); + try (FileInputStream inputStream = new FileInputStream(registryFile); + JSONObjectReader reader = new JSONObjectReader(inputStream)) + { + while (true) + { + final JSONObject o = reader.readObject(); + if (o == null) + { + break; + } + + final String oid = o.getFieldAsString("oid"); + assertNotNull(oid, "JSON object " + o + " does not contain an OID"); + + if (oidRegistry.get(oid) == null) + { + missingObjects.add(o); + } + } + } + + if (! missingObjects.isEmpty()) + { + final StringBuilder errorMessage = new StringBuilder(); + errorMessage.append("The OID registry was missing information about " + + "one or more JSON objects:"); + errorMessage.append(StaticUtils.EOL); + for (final JSONObject o : missingObjects) + { + errorMessage.append(StaticUtils.EOL); + errorMessage.append(o.toSingleLineString()); + errorMessage.append(StaticUtils.EOL); + try + { + new OIDRegistryItem(o); + } + catch (final Exception e) + { + errorMessage.append(e.getMessage()); + errorMessage.append(StaticUtils.EOL); + } + } + + fail(errorMessage.toString()); + } + } + + + + /** + * Generates a new version of the OID registry included in the LDAP SDK + * documentation and ensures that it matches the current version. + * + * @throws Exception If an unexpected problem occurs. + */ + @Test() + public void testLDAPSDKDocumentationIsUpToDate() + throws Exception + { + final File baseDir = new File(System.getProperty("basedir")); + final File buildDir = new File(baseDir, "build"); + final File testDir = new File(buildDir, "test"); + assertTrue(testDir.exists()); + assertTrue(testDir.isDirectory()); + + final File generatedHTMLFile = + new File(testDir, "ldap-sdk-oid-reference.html"); + + try (PrintWriter w = new PrintWriter(generatedHTMLFile)) + { + final String baseIndent = " "; + + w.println(baseIndent + "<div align=\"right\">"); + w.println("${TARGET=\"offline\"} " + + "<a href=\"${LDAP_SDK_HOME_URL}\" style=\"font-size: 85%\">LDAP " + + "SDK Home Page</a>"); + w.println("${TARGET=\"offline\"} <br>"); + w.println(baseIndent + " <a href=\"${BASE}index.${EXTENSION}\" " + + "style=\"font-size: 85%\">Product Information</a>"); + w.println(baseIndent + "</div>"); + w.println(); + w.println(baseIndent + "<h2>LDAP OID Reference</h2>"); + w.println(); + w.println(baseIndent + "<p>"); + w.println(baseIndent + " Object identifiers are used throughout LDAP, " + + "but they\u2019re particularly common in schema elements, " + + "controls, and extended operations. This document provides a " + + "table of some of the most common OIDs used in LDAP along with a " + + "brief explanation of their purpose and (when applicable) a " + + "reference to the appropriate specification."); + w.println(baseIndent + "</p>"); + w.println(); + w.println(baseIndent + "<table border=\"1\" cellpadding=\"5\" " + + "cellspacing=\"0\">"); + w.println(baseIndent + " <tr>"); + w.println(baseIndent + " <th align=\"left\">OID</th>"); + w.println(baseIndent + " <th align=\"left\">Purpose</th>"); + w.println(baseIndent + " <th align=\"left\">Source</th>"); + w.println(baseIndent + " </tr>"); + + final OIDRegistry registry = OIDRegistry.getDefault(); + assertNotNull(registry); + + for (final OIDRegistryItem item : registry.getItems().values()) + { + w.println(baseIndent + " <tr>"); + w.println(baseIndent + " <td>" + item.getOID() + "</td>"); + + final String type = item.getType(); + assertNotNull(type); + if (type.equals("Attribute Type") || type.equals("Object Class") || + type.equals("Matching Rule") || type.equals("Administrative Alert")) + { + w.println(baseIndent + " <td><tt>" + item.getName() + "</tt> " + + type + "</td>"); + } + else + { + w.println(baseIndent + " <td>" + item.getName() + ' ' + type + + "</td>"); + } + + final String origin = item.getOrigin(); + if (origin == null) + { + w.println(baseIndent + " <td></td>"); + } + else + { + final String url = item.getURL(); + if (url == null) + { + w.println(baseIndent + " <td>" + origin + "</td>"); + } + else + { + w.println(baseIndent + " <td><a href=\"" + url + + "\" target=\"_blank\">" + origin + "</a></td>"); + } + } + + w.println(baseIndent + " </tr>"); + } + + w.println(baseIndent + "</table>"); + } + + + // Compute SHA-256 digests of the newly generated OID reference with the + // existing version in the documentation. If they are different, then fail + // the test. + final MessageDigest sha256 = MessageDigest.getInstance("SHA-256"); + final byte[] generatedFileBytes = + StaticUtils.readFileBytes(generatedHTMLFile); + final byte[] generatedFileDigest = sha256.digest(generatedFileBytes); + + final File docsDir = new File(baseDir, "docs"); + final File existingHTMLFile = new File(docsDir, "ldap-oid-reference.html"); + final byte[] existingFileBytes = + StaticUtils.readFileBytes(existingHTMLFile); + final byte[] existingFileDigest = sha256.digest(existingFileBytes); + + assertEquals(generatedFileBytes, existingFileBytes, + "It appears that the OID registry has been updated, but the version " + + "in the LDAP SDK documentation has not been updated. Replace '" + + existingHTMLFile.getAbsolutePath() + "' with '" + + generatedHTMLFile.getAbsolutePath() + "'."); + } + + + + /** + * Generates a new version of the OID registry in a form that may be published + * on LDAP.com. This test does not attempt to ensure that the version on + * LDAP.com is update to date. + * + * @throws Exception If an unexpected problem occurs. + */ + @Test() + public void testGenerateLDAPDotComOIDReference() + throws Exception + { + final File baseDir = new File(System.getProperty("basedir")); + final File buildDir = new File(baseDir, "build"); + final File testDir = new File(buildDir, "test"); + assertTrue(testDir.exists()); + assertTrue(testDir.isDirectory()); + + final File generatedHTMLFile = + new File(testDir, "ldap.com-oid-reference.html"); + + try (PrintWriter w = new PrintWriter(generatedHTMLFile)) + { + w.println("<p>"); + w.println(" Object identifiers are used throughout LDAP, but " + + "they\u2019re particularly common in schema elements, controls, " + + "and extended operations. This document provides a table of some " + + "of the most common OIDs used in LDAP along with a brief " + + "explanation of their purpose and (when applicable) a reference " + + "to the appropriate specification."); + w.println("</p>"); + w.println(); + w.println("<p>"); + w.println(" For more information, see the explanation of <a " + + "href=\"https://ldap.com/object-identifiers/\" " + + "target=\"_blank\">object identifiers</a> in the <a " + + "href=\"https://ldap.com/understanding-ldap-schema/\" " + + "target=\"_blank\">Understanding LDAP Schema</a> section of this " + + "website. A much more thorough, walkable OID reference database " + + "(including non-LDAP-related OIDs) may be found at <a " + + "href=\"https://oidref.com/\" " + + "target=\"_blank\">https://oidref.com/</a>. To obtain your own " + + "OID base from the <a href=\"https://www.iana.org/assignments/" + + "enterprise-numbers/enterprise-numbers\" target=\"_blank\">IANA " + + "private enterprise number</a> registry, <a " + + "href=\"https://pen.iana.org/pen/PenApplication.page\" " + + "target=\"_blank\">use this application form</a>."); + w.println("</p>"); + w.println(); + w.println("<table border=\"1\" cellspacing=\"0\" cellpadding=\"5\">"); + w.println(" <tbody>"); + w.println(" <tr>"); + w.println(" <th align=\"left\">OID</th>"); + w.println(" <th align=\"left\">Purpose</th>"); + w.println(" <th align=\"left\">Source</th>"); + w.println(" </tr>"); + + final OIDRegistry registry = OIDRegistry.getDefault(); + assertNotNull(registry); + + for (final OIDRegistryItem item : registry.getItems().values()) + { + w.println(" <tr>"); + w.println(" <td>" + item.getOID() + "</td>"); + + final String type = item.getType(); + assertNotNull(type); + if (type.equals("Attribute Type") || type.equals("Object Class") || + type.equals("Matching Rule") || type.equals("Administrative Alert")) + { + w.println(" <td><tt>" + item.getName() + "</tt> " + type + + "</td>"); + } + else + { + w.println(" <td>" + item.getName() + ' ' + type + "</td>"); + } + + final String origin = item.getOrigin(); + if (origin == null) + { + w.println(" <td></td>"); + } + else + { + final String url = item.getURL(); + if (url == null) + { + w.println(" <td>" + origin + "</td>"); + } + else + { + w.println(" <td><a href=\"" + url + + "\" target=\"_blank\">" + origin + "</a></td>"); + } + } + + w.println(" </tr>"); + } + + w.println(" </tbody>"); + w.println("</table>"); + } + } + + + + /** + * Identifies any String constants in LDAP SDK source files whose name + * indicates that the value is expected to be an OID. + * + * @param c The source class to examine. + * + * @throws Exception If an unexpected problem occurs. + */ + @Test(dataProvider = "sdkClasses") + public void testSourceOIDsAreInTheRegistry(final Class<?> c) + throws Exception + { + for (final Field f : c.getDeclaredFields()) + { + final String name = f.getName(); + if (name.equals("OID") || name.contains("_OID") || name.contains("OID_")) + { + if (f.getType().equals(String.class) && + ((f.getModifiers() & Modifier.STATIC) != 0x00) && + ((f.getModifiers() & Modifier.FINAL) != 0x00)) + { + f.setAccessible(true); + + final String oid = (String) f.get(null); + if (OID.isValidNumericOID(oid)) + { + assertNotNull(OIDRegistry.getDefault().get(oid), + "OID '" + oid + "' defined in constant " + + c.getName() + '.' + f.getName() + " is not defined in " + + "the OID registry."); + } + } + } + } + } + + + + /** + * Retrieves the fully-qualified names of all classes included in the SDK. + * + * @return The fully-qualified names of all classes included in the SDK. + * + * @throws Exception If a problem occurs during processing. + */ + @DataProvider(name="sdkClasses") + public Object[][] getSDKClasses() + throws Exception + { + final File baseDir = new File(System.getProperty("basedir")); + final File buildDir = new File(baseDir, "build"); + final File classesDir = new File(buildDir, "classes"); + + final ArrayList<Class<?>> classList = new ArrayList<Class<?>>(); + findClasses("", classesDir, classList); + + Object[][] classes = new Object[classList.size()][1]; + for (int i=0; i < classes.length; i++) + { + classes[i][0] = classList.get(i); + } + + return classes; + } + + + + /** + * Recursively identifies all classes in the provided directory. + * + * @param p The package name associated with the provided directory. + * @param d The directory to be processed. + * @param l The to which the classes should be added. + * + * @throws Exception If a problem occurs during processing. + */ + private static void findClasses(final String p, final File d, + final ArrayList<Class<?>> l) + throws Exception + { + for (File f : d. listFiles()) + { + if (f.isDirectory()) + { + if (p.length() == 0) + { + findClasses(f.getName(), f, l); + } + else + { + findClasses(p + '.' + f.getName(), f, l); + } + } + else if (f.getName().endsWith(".class") && + (! f.getName().contains("$"))) + { + int dotPos = f.getName().lastIndexOf('.'); + String baseName = f.getName().substring(0, dotPos); + String className = p + '.' + baseName; + l.add(Class.forName(className)); + } + } + } }
0
1fc755ac0964cd56d9a2564967dc4747be223f23
https://github.com/DaveGamble/cJSON/commit/1fc755ac0964cd56d9a2564967dc4747be223f23
array's item should be in the list
diff --git a/tests/parse_array.c b/tests/parse_array.c index dfaae29b..d013f224 100644 --- a/tests/parse_array.c +++ b/tests/parse_array.c @@ -90,7 +90,8 @@ static void parse_array_should_parse_arrays_with_one_element(void) assert_parse_array("[[]]"); assert_has_child(item); - assert_is_array(item->child); + TEST_ASSERT_NOT_NULL(item->child); + assert_has_type(item->child, cJSON_Array); assert_has_no_child(item->child); reset(item);
0
bf8b091f054238c32ae265b67fdb8f2017c2d17d
https://github.com/perwendel/spark/commit/bf8b091f054238c32ae265b67fdb8f2017c2d17d
Merge branch 'ketan-improve/add-dates'
diff --git a/src/main/java/spark/Response.java b/src/main/java/spark/Response.java index 409a25528c..a122b2a0ee 100644 --- a/src/main/java/spark/Response.java +++ b/src/main/java/spark/Response.java @@ -16,13 +16,14 @@ */ package spark; -import java.io.IOException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.time.Instant; +import java.util.Date; /** * Provides functionality for modifying the response @@ -155,6 +156,46 @@ public void header(String header, String value) { response.addHeader(header, value); } + /** + * Adds/Sets a response header + * + * @param header the header + * @param value the value + */ + public void header(String header, int value) { + response.addIntHeader(header, value); + } + + /** + * Adds/Sets a response header + * + * @param header the header + * @param value the value + */ + public void header(String header, Date value) { + response.addDateHeader(header, value.getTime()); + } + + /** + * Adds/Sets a response header + * + * @param header the header + * @param value the value + */ + public void header(String header, java.sql.Date value) { + response.addDateHeader(header, value.getTime()); + } + + /** + * Adds/Sets a response header + * + * @param header the header + * @param value the value + */ + public void header(String header, Instant value) { + response.addDateHeader(header, value.toEpochMilli()); + } + /** * Adds not persistent cookie to the response. * Can be invoked multiple times to insert more than one cookie. diff --git a/src/test/java/spark/ResponseTest.java b/src/test/java/spark/ResponseTest.java index 4803452061..8a55ed210a 100644 --- a/src/test/java/spark/ResponseTest.java +++ b/src/test/java/spark/ResponseTest.java @@ -7,6 +7,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; @@ -93,6 +94,33 @@ public void testHeader() { verify(httpServletResponse).addHeader(finalHeaderKey, finalHeaderValue); } + @Test + public void testIntHeader() { + response.header("X-Processing-Time", 10); + verify(httpServletResponse).addIntHeader("X-Processing-Time", 10); + } + + @Test + public void testJavaUtilDateHeader() { + Date now = new Date(); + response.header("X-Processing-Since", now); + verify(httpServletResponse).addDateHeader("X-Processing-Since", now.getTime()); + } + + @Test + public void testJavaSqlDateHeader() { + Date now = new Date(); + response.header("X-Processing-Since", new java.sql.Date(now.getTime())); + verify(httpServletResponse).addDateHeader("X-Processing-Since", now.getTime()); + } + + @Test + public void testInstantDateHeader() { + Date now = new Date(); + response.header("X-Processing-Since", now.toInstant()); + verify(httpServletResponse).addDateHeader("X-Processing-Since", now.getTime()); + } + private void validateCookieContent(Cookie cookie, String domain, String path, @@ -261,4 +289,4 @@ public void testRedirect_whenLocationAndHttpStatusCodeParameters_shouldModifySta verify(httpServletResponse).setHeader("Connection", "close"); verify(httpServletResponse).sendError(finalStatusCode); } -} \ No newline at end of file +}
0