input
stringlengths 205
73.3k
| output
stringlengths 64
73.2k
| instruction
stringclasses 1
value |
|---|---|---|
#vulnerable code
@Test
public void shouldBeAbleToDumpReadOnlyQueueFile() throws Exception {
if (OS.isWindows())
return;
final File dataDir = DirectoryUtils.tempDir(DumpQueueMainTest.class.getSimpleName());
final SingleChronicleQueue queue = SingleChronicleQueueBuilder.
binary(dataDir).
build();
final ExcerptAppender excerptAppender = queue.acquireAppender();
excerptAppender.writeText("first");
excerptAppender.writeText("last");
final Path queueFile = Files.list(dataDir.toPath()).
filter(p -> p.toString().endsWith(SingleChronicleQueue.SUFFIX)).
findFirst().orElseThrow(() ->
new AssertionError("Could not find queue file in directory " + dataDir));
assertThat(queueFile.toFile().setWritable(false), is(true));
final CountingOutputStream countingOutputStream = new CountingOutputStream();
DumpQueueMain.dump(queueFile.toFile(), new PrintStream(countingOutputStream), Long.MAX_VALUE);
assertThat(countingOutputStream.bytes, is(not(0L)));
}
#location 11
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void shouldBeAbleToDumpReadOnlyQueueFile() throws Exception {
if (OS.isWindows())
return;
final File dataDir = DirectoryUtils.tempDir(DumpQueueMainTest.class.getSimpleName());
try (final SingleChronicleQueue queue = SingleChronicleQueueBuilder.
binary(dataDir).
build()) {
final ExcerptAppender excerptAppender = queue.acquireAppender();
excerptAppender.writeText("first");
excerptAppender.writeText("last");
final Path queueFile = Files.list(dataDir.toPath()).
filter(p -> p.toString().endsWith(SingleChronicleQueue.SUFFIX)).
findFirst().orElseThrow(() ->
new AssertionError("Could not find queue file in directory " + dataDir));
assertThat(queueFile.toFile().setWritable(false), is(true));
final CountingOutputStream countingOutputStream = new CountingOutputStream();
DumpQueueMain.dump(queueFile.toFile(), new PrintStream(countingOutputStream), Long.MAX_VALUE);
assertThat(countingOutputStream.bytes, is(not(0L)));
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void shouldDetermineQueueDirectoryFromQueueFile() throws Exception {
final File queuePath = DirectoryUtils.tempDir(getClass().getSimpleName());
try (final SingleChronicleQueue queue =
SingleChronicleQueueBuilder.binary(queuePath)
.testBlockSize()
.build()) {
try (DocumentContext ctx = queue.acquireAppender().writingDocument()) {
ctx.wire().write("key").text("value");
}
}
final Path path = queuePath.listFiles(QUEUE_FILE_FILTER)[0].toPath();
try (final SingleChronicleQueue queue =
SingleChronicleQueueBuilder.binary(path)
.testBlockSize()
.build()) {
assertThat(queue.createTailer().readingDocument().isPresent(), is(true));
}
}
#location 9
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Test
public void shouldDetermineQueueDirectoryFromQueueFile() throws Exception {
final Path path = Paths.get(OS.USER_DIR, TEST_QUEUE_FILE);
try (final SingleChronicleQueue queue =
SingleChronicleQueueBuilder.binary(path)
.testBlockSize()
.build()) {
assertThat(queue.createTailer().readingDocument().isPresent(), is(true));
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
private static long getCurrentQueueFileLength(final Path dataDir) throws IOException {
return new RandomAccessFile(
Files.list(dataDir).filter(p -> p.toString().endsWith("cq4")).findFirst().
orElseThrow(AssertionError::new).toFile(), "r").length();
}
#location 4
#vulnerability type RESOURCE_LEAK
|
#fixed code
private static long getCurrentQueueFileLength(final Path dataDir) throws IOException {
try (RandomAccessFile file = new RandomAccessFile(
Files.list(dataDir).filter(p -> p.toString().endsWith("cq4")).findFirst().
orElseThrow(AssertionError::new).toFile(), "r")) {
return file.length();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public VanillaFile dataForLast(int cycle, int threadId) throws IOException {
String cycleStr = dateCache.formatFor(cycle);
String dataPrefix = basePath + "/" + cycleStr + "/data-" + threadId + "-";
if (lastCycle != cycle) {
int maxCount = 0;
File[] files = new File(dataPrefix).listFiles();
if (files != null)
for (File file : files) {
if (file.getName().startsWith(dataPrefix)) {
int count = Integer.parseInt(file.getName().substring(dataPrefix.length()));
if (maxCount < count)
maxCount = count;
}
}
lastCycle = cycle;
lastCount = maxCount;
}
return dataFor(cycle, threadId, lastCount, true);
}
#location 2
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public VanillaFile dataForLast(int cycle, int threadId) throws IOException {
String cycleStr = dateCache.formatFor(cycle);
String cyclePath = basePath + "/" + cycleStr;
String dataPrefix = "data-" + threadId + "-";
if (lastCycle != cycle) {
int maxCount = 0;
File[] files = new File(cyclePath).listFiles();
if (files != null)
for (File file : files) {
if (file.getName().startsWith(dataPrefix)) {
int count = Integer.parseInt(file.getName().substring(dataPrefix.length()));
if (maxCount < count)
maxCount = count;
}
}
lastCycle = cycle;
lastCount = maxCount;
}
return dataFor(cycle, threadId, lastCount, true);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testOverTCP() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
// NOTE: the sink and source must have different chronicle files.
// TODO, make more robust.
final int messages = 5 * 1000 * 1000;
final Chronicle source = new ChronicleSource(ChronicleQueueBuilder.indexed(basePathSource).build(), PORT + 1);
final Chronicle sink = new ChronicleSink(ChronicleQueueBuilder.indexed(basePathSink).build(), "localhost", PORT + 1);
Thread t = new Thread(new Runnable() {
@Override
public void run() {
try {
ExcerptAppender excerpt = source.createAppender();
for (int i = 1; i <= messages; i++) {
// use a size which will cause mis-alignment.
excerpt.startExcerpt();
excerpt.writeLong(i);
excerpt.append(' ');
excerpt.append(i);
excerpt.append('\n');
excerpt.finish();
}
System.out.println(System.currentTimeMillis() + ": Finished writing messages");
} catch (Exception e) {
throw new AssertionError(e);
}
}
});
long start = System.nanoTime();
t.start();
ExcerptTailer excerpt = sink.createTailer();
int count = 0;
for (int i = 1; i <= messages; i++) {
while (!excerpt.nextIndex()) {
count++;
}
long n = excerpt.readLong();
String text = excerpt.parseUTF(StopCharTesters.CONTROL_STOP);
if (i != n) {
assertEquals('\'' + text + '\'', i, n);
}
excerpt.finish();
}
sink.close();
System.out.println("There were " + count + " InSynk messages");
t.join();
source.close();
long time = System.nanoTime() - start;
System.out.printf("Messages per second %,d%n", (int) (messages * 1e9 / time));
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
#location 26
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testOverTCP() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
// NOTE: the sink and source must have different chronicle files.
// TODO, make more robust.
final int messages = 5 * 1000 * 1000;
final Chronicle source = ChronicleQueueBuilder.indexed(basePathSource)
.source()
.bindAddress(BASE_PORT + 1)
.build();
final Chronicle sink = ChronicleQueueBuilder.indexed(basePathSink)
.sink()
.connectAddress("localhost", BASE_PORT + 1)
.build();
Thread t = new Thread(new Runnable() {
@Override
public void run() {
try {
ExcerptAppender excerpt = source.createAppender();
for (int i = 1; i <= messages; i++) {
// use a size which will cause mis-alignment.
excerpt.startExcerpt();
excerpt.writeLong(i);
excerpt.append(' ');
excerpt.append(i);
excerpt.append('\n');
excerpt.finish();
}
System.out.println(System.currentTimeMillis() + ": Finished writing messages");
} catch (Exception e) {
throw new AssertionError(e);
}
}
});
long start = System.nanoTime();
t.start();
ExcerptTailer excerpt = sink.createTailer();
int count = 0;
for (int i = 1; i <= messages; i++) {
while (!excerpt.nextIndex()) {
count++;
}
long n = excerpt.readLong();
String text = excerpt.parseUTF(StopCharTesters.CONTROL_STOP);
if (i != n) {
assertEquals('\'' + text + '\'', i, n);
}
excerpt.finish();
}
sink.close();
System.out.println("There were " + count + " InSynk messages");
t.join();
source.close();
long time = System.nanoTime() - start;
System.out.printf("Messages per second %,d%n", (int) (messages * 1e9 / time));
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testPersistedLocalVanillaSink_001() throws Exception {
final int port = BASE_PORT + 301;
final String basePath = getVanillaTestPath();
final Chronicle chronicle = ChronicleQueueBuilder.vanilla(basePath).build();
final ChronicleSource source = new ChronicleSource(chronicle, port);
final Chronicle sink = localChronicleSink(chronicle, "localhost", port);
final CountDownLatch latch = new CountDownLatch(5);
final Random random = new Random();
final int items = 100;
try {
Thread appenderThread = new Thread() {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (long i = 1; i <= items; i++) {
if (latch.getCount() > 0) {
latch.countDown();
}
appender.startExcerpt(8);
appender.writeLong(i);
appender.finish();
sleep(10 + random.nextInt(80));
appender.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
};
appenderThread.start();
latch.await();
final ExcerptTailer tailer1 = sink.createTailer().toStart();
for (long i = 1; i <= items; i++) {
assertTrue(tailer1.nextIndex());
assertEquals(i, tailer1.readLong());
tailer1.finish();
}
tailer1.close();
appenderThread.join();
sink.close();
sink.clear();
} finally {
source.close();
source.clear();
}
}
#location 55
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testPersistedLocalVanillaSink_001() throws Exception {
final int port = BASE_PORT + 301;
final String basePath = getVanillaTestPath();
final Chronicle chronicle = ChronicleQueueBuilder.vanilla(basePath).build();
final Chronicle source = ChronicleQueueBuilder.source(chronicle)
.bindAddress("localhost", port)
.build();
final Chronicle sink = ChronicleQueueBuilder.sink(chronicle)
.sharedChronicle(true)
.connectAddress("localhost",port)
.build();
final CountDownLatch latch = new CountDownLatch(5);
final Random random = new Random();
final int items = 100;
try {
Thread appenderThread = new Thread() {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (long i = 1; i <= items; i++) {
if (latch.getCount() > 0) {
latch.countDown();
}
appender.startExcerpt(8);
appender.writeLong(i);
appender.finish();
sleep(10 + random.nextInt(80));
appender.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
};
appenderThread.start();
latch.await();
final ExcerptTailer tailer1 = sink.createTailer().toStart();
for (long i = 1; i <= items; i++) {
assertTrue(tailer1.nextIndex());
assertEquals(i, tailer1.readLong());
tailer1.finish();
}
tailer1.close();
appenderThread.join();
sink.close();
sink.clear();
} finally {
source.close();
source.clear();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public void init() {
final long timeoutAt = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(20L);
boolean warnedOnFailure = false;
while (System.currentTimeMillis() < timeoutAt) {
try (final FileChannel channel = FileChannel.open(tableStore.file().toPath(),
StandardOpenOption.WRITE);
final FileLock fileLock = channel.tryLock()) {
maxCycleValue = tableStore.acquireValueFor(HIGHEST_CREATED_CYCLE);
minCycleValue = tableStore.acquireValueFor(LOWEST_CREATED_CYCLE);
lock = tableStore.acquireValueFor(LOCK);
modCount = tableStore.acquireValueFor(MOD_COUNT);
if (lock.getVolatileValue() == Long.MIN_VALUE) {
lock.compareAndSwapValue(Long.MIN_VALUE, 0);
}
if (modCount.getVolatileValue() == Long.MIN_VALUE) {
modCount.compareAndSwapValue(Long.MIN_VALUE, 0);
}
return;
} catch (IOException | RuntimeException e) {
// failed to acquire the lock, wait until other operation completes
if (!warnedOnFailure) {
LOGGER.warn("Failed to acquire a lock on the directory-listing file: {}:{}. Retrying.",
e.getClass().getSimpleName(), e.getMessage());
warnedOnFailure = true;
}
Jvm.pause(50L);
}
}
throw new IllegalStateException("Unable to claim exclusive lock on file " + tableStore.file());
}
#location 6
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Override
public void init() {
tableStore.doWithExclusiveLock(ts -> {
maxCycleValue = ts.acquireValueFor(HIGHEST_CREATED_CYCLE);
minCycleValue = ts.acquireValueFor(LOWEST_CREATED_CYCLE);
lock = ts.acquireValueFor(LOCK);
modCount = ts.acquireValueFor(MOD_COUNT);
if (lock.getVolatileValue() == Long.MIN_VALUE) {
lock.compareAndSwapValue(Long.MIN_VALUE, 0);
}
if (modCount.getVolatileValue() == Long.MIN_VALUE) {
modCount.compareAndSwapValue(Long.MIN_VALUE, 0);
}
return this;
});
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testPricePublishing2() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
final Chronicle source = new ChronicleSource(ChronicleQueueBuilder.indexed(basePathSource).build(), PORT + 3);
final Chronicle sink = new ChronicleSink(ChronicleQueueBuilder.indexed(basePathSink).build(), "localhost", PORT + 3);
final PriceWriter pw = new PriceWriter(source.createAppender());
final AtomicInteger count = new AtomicInteger();
final PriceReader reader = new PriceReader(sink.createTailer(), new PriceListener() {
@Override
public void onPrice(long timeInMicros, String symbol, double bp, int bq, double ap, int aq) {
count.incrementAndGet();
}
});
pw.onPrice(1, "symbol", 99.9, 1, 100.1, 2);
assertEquals(-1, reader.excerpt.index());
reader.read();
assertEquals(0, reader.excerpt.index());
long start = System.nanoTime();
int prices = 2 * 1000 * 1000;
for (int i = 1; i <= prices; i++) {
pw.onPrice(i, "symbol", 99.9, i, 100.1, i + 1);
}
long mid = System.nanoTime();
while (count.get() < prices) {
reader.read();
}
long end = System.nanoTime();
System.out.printf("Took an average of %.2f us to write and %.2f us to read using Excerpt%n",
(mid - start) / prices / 1e3, (end - mid) / prices / 1e3);
source.close();
sink.close();
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
#location 15
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testPricePublishing2() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
final Chronicle source = ChronicleQueueBuilder.indexed(basePathSource)
.source()
.bindAddress(BASE_PORT + 3)
.build();
final Chronicle sink = ChronicleQueueBuilder.indexed(basePathSink)
.sink()
.connectAddress("localhost", BASE_PORT + 3)
.build();
final PriceWriter pw = new PriceWriter(source.createAppender());
final AtomicInteger count = new AtomicInteger();
final PriceReader reader = new PriceReader(sink.createTailer(), new PriceListener() {
@Override
public void onPrice(long timeInMicros, String symbol, double bp, int bq, double ap, int aq) {
count.incrementAndGet();
}
});
pw.onPrice(1, "symbol", 99.9, 1, 100.1, 2);
assertEquals(-1, reader.excerpt.index());
reader.read();
assertEquals(0, reader.excerpt.index());
long start = System.nanoTime();
int prices = 2 * 1000 * 1000;
for (int i = 1; i <= prices; i++) {
pw.onPrice(i, "symbol", 99.9, i, 100.1, i + 1);
}
long mid = System.nanoTime();
while (count.get() < prices) {
reader.read();
}
long end = System.nanoTime();
System.out.printf("Took an average of %.2f us to write and %.2f us to read using Excerpt%n",
(mid - start) / prices / 1e3, (end - mid) / prices / 1e3);
source.close();
sink.close();
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
protected void writeBytesInternal(final long index, @NotNull final BytesStore bytes, boolean metadata) {
final int cycle = queue.rollCycle().toCycle(index);
long headerNumber = wire.headerNumber();
if (wire == null) {
setCycle2(cycle, true);
headerNumber = wire.headerNumber();
} else if (queue.rollCycle().toCycle(headerNumber) != cycle) {
rollCycleTo(cycle);
headerNumber = wire.headerNumber();
}
boolean isNextIndex = index == headerNumber + 1;
if (!isNextIndex) {
// in case our cached headerNumber is incorrect.
if (resetPosition()) {
headerNumber = wire.headerNumber();
/// if the header number has changed then we will have roll
if (queue.rollCycle().toCycle(headerNumber) != cycle) {
rollCycleTo(cycle);
headerNumber = wire.headerNumber();
}
}
isNextIndex = index == headerNumber + 1;
if (!isNextIndex) {
if (index > headerNumber + 1)
throw new IllegalStateException("Unable to move to index " + Long.toHexString(index) + " beyond the end of the queue, current: " + Long.toHexString(headerNumber));
Jvm.warn().on(getClass(), "Trying to overwrite index " + Long.toHexString(index) + " which is before the end of the queue");
return;
}
}
writeBytesInternal(bytes, metadata);
}
#location 3
#vulnerability type NULL_DEREFERENCE
|
#fixed code
protected void writeBytesInternal(final long index, @NotNull final BytesStore bytes, boolean metadata) {
final int cycle = queue.rollCycle().toCycle(index);
if (wire == null)
setCycle2(cycle, true);
else if (queue.rollCycle().toCycle(wire.headerNumber()) != cycle)
rollCycleTo(cycle);
long headerNumber = wire.headerNumber();
boolean isNextIndex = index == headerNumber + 1;
if (!isNextIndex) {
// in case our cached headerNumber is incorrect.
if (resetPosition()) {
headerNumber = wire.headerNumber();
/// if the header number has changed then we will have roll
if (queue.rollCycle().toCycle(headerNumber) != cycle) {
rollCycleTo(cycle);
headerNumber = wire.headerNumber();
}
}
isNextIndex = index == headerNumber + 1;
if (!isNextIndex) {
if (index > headerNumber + 1)
throw new IllegalStateException("Unable to move to index " + Long.toHexString(index) + " beyond the end of the queue, current: " + Long.toHexString(headerNumber));
Jvm.warn().on(getClass(), "Trying to overwrite index " + Long.toHexString(index) + " which is before the end of the queue");
return;
}
}
writeBytesInternal(bytes, metadata);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testSimpledSingleThreadedWriteRead() throws Exception {
try (DirectStore allocate = DirectStore.allocate(150)) {
final BytesQueue bytesRingBuffer = new BytesQueue(allocate.bytes());
bytesRingBuffer.offer(output.clear());
Bytes poll = bytesRingBuffer.poll(input.clear());
assertEquals(EXPECTED, poll.readUTF());
}
}
#location 10
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Test
public void testSimpledSingleThreadedWriteRead() throws Exception {
try (DirectStore allocate = DirectStore.allocate(150)) {
final BytesRingBuffer bytesRingBuffer = new BytesRingBuffer(allocate.bytes());
bytesRingBuffer.offer(output.clear());
Bytes actual = bytesRingBuffer.take(maxSize -> input.clear());
assertEquals(EXPECTED, actual.readUTF());
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testSourceSinkStartResumeRollingEverySecond() throws Exception {
//This is the config that is required to make the VanillaChronicle roll every second
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
assertNotNull(sourceBasePath);
assertNotNull(sinkBasePath);
final ChronicleSource source = new ChronicleSource(
ChronicleQueueBuilder.vanilla(sourceBasePath)
.entriesPerCycle(1L << 20)
.cycleLength(1000, false)
.cycleFormat("yyyyMMddHHmmss")
.indexBlockSize(16L << 10)
.build(),
8888);
ExcerptAppender appender = source.createAppender();
System.out.print("writing 100 items will take take 10 seconds.");
for (int i = 0; i < 100; i++) {
appender.startExcerpt();
int value = 1000000000 + i;
appender.append(value).append(' '); //this space is really important.
appender.finish();
Thread.sleep(100);
if(i % 10==0) {
System.out.print(".");
}
}
appender.close();
System.out.print("\n");
//create a tailer to get the first 50 items then exit the tailer
final ChronicleSink sink1 = new ChronicleSink(
ChronicleQueueBuilder.vanilla(sinkBasePath)
.entriesPerCycle(1L << 20)
.cycleLength(1000, false)
.cycleFormat("yyyyMMddHHmmss")
.indexBlockSize(16L << 10)
.build(),
"localhost",
8888);
final ExcerptTailer tailer1 = sink1.createTailer().toStart();
System.out.println("Sink1 reading first 50 items then stopping");
for( int count=0; count < 50 ;) {
if(tailer1.nextIndex()) {
assertEquals(1000000000 + count, tailer1.parseLong());
tailer1.finish();
count++;
}
}
tailer1.close();
sink1.close();
sink1.checkCounts(1, 1);
//now resume the tailer to get the first 50 items
final ChronicleSink sink2 = new ChronicleSink(
ChronicleQueueBuilder.vanilla(sinkBasePath)
.entriesPerCycle(1L << 20)
.cycleLength(1000, false)
.cycleFormat("yyyyMMddHHmmss")
.indexBlockSize(16L << 10)
.build(),
"localhost",
8888);
//Take the tailer to the last index (item 50) and start reading from there.
final ExcerptTailer tailer2 = sink2.createTailer().toEnd();
assertEquals(1000000000 + 49, tailer2.parseLong());
tailer2.finish();
System.out.println("Sink2 restarting to continue to read the next 50 items");
for(int count=50 ; count < 100 ; ) {
if(tailer2.nextIndex()) {
assertEquals(1000000000 + count, tailer2.parseLong());
tailer2.finish();
count++;
}
}
tailer2.close();
sink2.close();
sink2.checkCounts(1, 1);
sink2.clear();
source.close();
source.checkCounts(1, 1);
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
#location 30
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testSourceSinkStartResumeRollingEverySecond() throws Exception {
//This is the config that is required to make the VanillaChronicle roll every second
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
assertNotNull(sourceBasePath);
assertNotNull(sinkBasePath);
final Chronicle source = ChronicleQueueBuilder.source(
ChronicleQueueBuilder.vanilla(sourceBasePath)
.entriesPerCycle(1L << 20)
.cycleLength(1000, false)
.cycleFormat("yyyyMMddHHmmss")
.indexBlockSize(16L << 10)
.build())
.bindAddress("localhost", BASE_PORT + 104)
.build();
ExcerptAppender appender = source.createAppender();
System.out.print("writing 100 items will take take 10 seconds.");
for (int i = 0; i < 100; i++) {
appender.startExcerpt();
int value = 1000000000 + i;
appender.append(value).append(' '); //this space is really important.
appender.finish();
Thread.sleep(100);
if(i % 10==0) {
System.out.print(".");
}
}
appender.close();
System.out.print("\n");
//create a tailer to get the first 50 items then exit the tailer
final Chronicle sink1 = ChronicleQueueBuilder.sink(
ChronicleQueueBuilder.vanilla(sinkBasePath)
.entriesPerCycle(1L << 20)
.cycleLength(1000, false)
.cycleFormat("yyyyMMddHHmmss")
.indexBlockSize(16L << 10)
.build())
.connectAddress("localhost", BASE_PORT + 104)
.build();
final ExcerptTailer tailer1 = sink1.createTailer().toStart();
System.out.println("Sink1 reading first 50 items then stopping");
for( int count=0; count < 50 ;) {
if(tailer1.nextIndex()) {
assertEquals(1000000000 + count, tailer1.parseLong());
tailer1.finish();
count++;
}
}
tailer1.close();
sink1.close();
//TODO: fix sink1.checkCounts(1, 1);
//now resume the tailer to get the first 50 items
final Chronicle sink2 = ChronicleQueueBuilder.sink(
ChronicleQueueBuilder.vanilla(sinkBasePath)
.entriesPerCycle(1L << 20)
.cycleLength(1000, false)
.cycleFormat("yyyyMMddHHmmss")
.indexBlockSize(16L << 10)
.build())
.connectAddress("localhost", BASE_PORT + 104)
.build();
//Take the tailer to the last index (item 50) and start reading from there.
final ExcerptTailer tailer2 = sink2.createTailer().toEnd();
assertEquals(1000000000 + 49, tailer2.parseLong());
tailer2.finish();
System.out.println("Sink2 restarting to continue to read the next 50 items");
for(int count=50 ; count < 100 ; ) {
if(tailer2.nextIndex()) {
assertEquals(1000000000 + count, tailer2.parseLong());
tailer2.finish();
count++;
}
}
tailer2.close();
sink2.close();
//TODO: fix sink2.checkCounts(1, 1);
sink2.clear();
source.close();
//TODO: fix source.checkCounts(1, 1);
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testPricePublishing3() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
final Chronicle source = new ChronicleSource(ChronicleQueueBuilder.indexed(basePathSource).build(), PORT + 4);
final Chronicle sink = new ChronicleSink(ChronicleQueueBuilder.indexed(basePathSink).build(), "localhost", PORT + 4);
final PriceWriter pw = new PriceWriter(source.createAppender());
final AtomicInteger count = new AtomicInteger();
PriceReader reader = new PriceReader(sink.createTailer(), new PriceListener() {
@Override
public void onPrice(long timeInMicros, String symbol, double bp, int bq, double ap, int aq) {
count.incrementAndGet();
}
});
pw.onPrice(1, "symbol", 99.9, 1, 100.1, 2);
assertEquals(-1, reader.excerpt.index());
reader.read();
assertEquals(0, reader.excerpt.index());
long start = System.nanoTime();
int prices = 2 * 1000 * 1000;
for (int i = 1; i <= prices; i++) {
pw.onPrice(i, "symbol", 99.9, i, 100.1, i + 1);
}
long mid = System.nanoTime();
while (count.get() < prices)
reader.read();
long end = System.nanoTime();
System.out.printf("Took an average of %.2f us to write and %.2f us to read using Tailer%n",
(mid - start) / prices / 1e3, (end - mid) / prices / 1e3);
source.close();
sink.close();
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
#location 15
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testPricePublishing3() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
final Chronicle source = ChronicleQueueBuilder.indexed(basePathSource)
.source()
.bindAddress(BASE_PORT + 4)
.build();
final Chronicle sink = ChronicleQueueBuilder.indexed(basePathSink)
.sink()
.connectAddress("localhost", BASE_PORT + 4)
.build();
final PriceWriter pw = new PriceWriter(source.createAppender());
final AtomicInteger count = new AtomicInteger();
PriceReader reader = new PriceReader(sink.createTailer(), new PriceListener() {
@Override
public void onPrice(long timeInMicros, String symbol, double bp, int bq, double ap, int aq) {
count.incrementAndGet();
}
});
pw.onPrice(1, "symbol", 99.9, 1, 100.1, 2);
assertEquals(-1, reader.excerpt.index());
reader.read();
assertEquals(0, reader.excerpt.index());
long start = System.nanoTime();
int prices = 2 * 1000 * 1000;
for (int i = 1; i <= prices; i++) {
pw.onPrice(i, "symbol", 99.9, i, 100.1, i + 1);
}
long mid = System.nanoTime();
while (count.get() < prices)
reader.read();
long end = System.nanoTime();
System.out.printf("Took an average of %.2f us to write and %.2f us to read using Tailer%n",
(mid - start) / prices / 1e3, (end - mid) / prices / 1e3);
source.close();
sink.close();
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testReplication1() throws IOException {
final int RUNS = 100;
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
final ChronicleSource source = new ChronicleSource(new VanillaChronicle(sourceBasePath), 0);
final ChronicleSink sink = new ChronicleSink(new VanillaChronicle(sinkBasePath), "localhost", source.getLocalPort());
try {
final ExcerptAppender appender = source.createAppender();
final ExcerptTailer tailer = sink.createTailer();
for (int i = 0; i < RUNS; i++) {
appender.startExcerpt();
long value = 1000000000 + i;
appender.append(value).append(' ');
appender.finish();
while(!tailer.nextIndex());
long val = tailer.parseLong();
//System.out.println("" + val);
assertEquals("i: " + i, value, val);
assertEquals("i: " + i, 0, tailer.remaining());
tailer.finish();
}
appender.close();
tailer.close();
} finally {
sink.close();
sink.checkCounts(1, 1);
sink.clear();
source.close();
source.checkCounts(1, 1);
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
}
#location 38
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testReplication1() throws Exception {
final int RUNS = 100;
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
final ChronicleSource source = new ChronicleSource(
new VanillaChronicle(sourceBasePath), 0);
final ChronicleSink sink = new ChronicleSink(
new VanillaChronicle(sinkBasePath), "localhost", source.getLocalPort());
try {
final Thread at = new Thread("th-appender") {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (int i = 0; i < RUNS; i++) {
appender.startExcerpt();
long value = 1000000000 + i;
appender.append(value).append(' ');
appender.finish();
}
appender.close();
} catch(Exception e) {
}
}
};
final Thread tt = new Thread("th-tailer") {
public void run() {
try {
final ExcerptTailer tailer = sink.createTailer();
for (int i = 0; i < RUNS; i++) {
long value = 1000000000 + i;
assertTrue(tailer.nextIndex());
long val = tailer.parseLong();
assertEquals("i: " + i, value, val);
assertEquals("i: " + i, 0, tailer.remaining());
tailer.finish();
}
tailer.close();
} catch(Exception e) {
}
}
};
at.start();
tt.start();
at.join();
tt.join();
} finally {
sink.close();
sink.clear();
source.close();
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testFlowAroundSingleThreadedWriteDiffrentSizeBuffers() throws Exception {
for (int j = 23 + 34; j < 100; j++) {
try (DirectStore allocate = DirectStore.allocate(j)) {
final BytesQueue bytesRingBuffer = new BytesQueue(allocate.bytes());
for (int i = 0; i < 50; i++) {
bytesRingBuffer.offer(output.clear());
assertEquals(EXPECTED, bytesRingBuffer.poll(input.clear()).readUTF());
}
}
}
}
#location 11
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Test
public void testFlowAroundSingleThreadedWriteDiffrentSizeBuffers() throws Exception {
for (int j = 23 + 34; j < 100; j++) {
try (DirectStore allocate = DirectStore.allocate(j)) {
final BytesRingBuffer bytesRingBuffer = new BytesRingBuffer(allocate.bytes());
for (int i = 0; i < 50; i++) {
bytesRingBuffer.offer(output.clear());
assertEquals(EXPECTED, bytesRingBuffer.take(maxSize -> input.clear()).readUTF());
}
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testReplication1() throws Exception {
final int RUNS = 100;
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
final ChronicleSource source = new ChronicleSource(
ChronicleQueueBuilder.vanilla(sourceBasePath).build(), 0);
final ChronicleSink sink = new ChronicleSink(
ChronicleQueueBuilder.vanilla(sinkBasePath).build(), "localhost", source.getLocalPort());
try {
final Thread at = new Thread("th-appender") {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (int i = 0; i < RUNS; i++) {
appender.startExcerpt();
long value = 1000000000 + i;
appender.append(value).append(' ');
appender.finish();
}
appender.close();
} catch(Exception e) {
}
}
};
final Thread tt = new Thread("th-tailer") {
public void run() {
try {
final ExcerptTailer tailer = sink.createTailer();
for (int i = 0; i < RUNS; i++) {
long value = 1000000000 + i;
assertTrue(tailer.nextIndex());
long val = tailer.parseLong();
assertEquals("i: " + i, value, val);
assertEquals("i: " + i, 0, tailer.remaining());
tailer.finish();
}
tailer.close();
} catch(Exception e) {
}
}
};
at.start();
tt.start();
at.join();
tt.join();
} finally {
sink.close();
sink.clear();
source.close();
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
}
#location 62
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testReplication1() throws Exception {
final int RUNS = 100;
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
final Chronicle source = ChronicleQueueBuilder.vanilla(sourceBasePath)
.source()
.bindAddress("localhost", BASE_PORT + 101)
.build();
final Chronicle sink = ChronicleQueueBuilder.vanilla(sinkBasePath)
.sink()
.connectAddress("localhost", BASE_PORT + 101)
.build();
try {
final Thread at = new Thread("th-appender") {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (int i = 0; i < RUNS; i++) {
appender.startExcerpt();
long value = 1000000000 + i;
appender.append(value).append(' ');
appender.finish();
}
appender.close();
} catch(Exception e) {
}
}
};
final Thread tt = new Thread("th-tailer") {
public void run() {
try {
final ExcerptTailer tailer = sink.createTailer();
for (int i = 0; i < RUNS; i++) {
long value = 1000000000 + i;
assertTrue(tailer.nextIndex());
long val = tailer.parseLong();
assertEquals("i: " + i, value, val);
assertEquals("i: " + i, 0, tailer.remaining());
tailer.finish();
}
tailer.close();
} catch(Exception e) {
}
}
};
at.start();
tt.start();
at.join();
tt.join();
} finally {
sink.close();
sink.clear();
source.close();
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testPricePublishing2() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
final Chronicle source = new ChronicleSource(ChronicleQueueBuilder.indexed(basePathSource).build(), PORT + 3);
final Chronicle sink = new ChronicleSink(ChronicleQueueBuilder.indexed(basePathSink).build(), "localhost", PORT + 3);
final PriceWriter pw = new PriceWriter(source.createAppender());
final AtomicInteger count = new AtomicInteger();
final PriceReader reader = new PriceReader(sink.createTailer(), new PriceListener() {
@Override
public void onPrice(long timeInMicros, String symbol, double bp, int bq, double ap, int aq) {
count.incrementAndGet();
}
});
pw.onPrice(1, "symbol", 99.9, 1, 100.1, 2);
assertEquals(-1, reader.excerpt.index());
reader.read();
assertEquals(0, reader.excerpt.index());
long start = System.nanoTime();
int prices = 2 * 1000 * 1000;
for (int i = 1; i <= prices; i++) {
pw.onPrice(i, "symbol", 99.9, i, 100.1, i + 1);
}
long mid = System.nanoTime();
while (count.get() < prices) {
reader.read();
}
long end = System.nanoTime();
System.out.printf("Took an average of %.2f us to write and %.2f us to read using Excerpt%n",
(mid - start) / prices / 1e3, (end - mid) / prices / 1e3);
source.close();
sink.close();
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
#location 15
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testPricePublishing2() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
final Chronicle source = ChronicleQueueBuilder.indexed(basePathSource)
.source()
.bindAddress(BASE_PORT + 3)
.build();
final Chronicle sink = ChronicleQueueBuilder.indexed(basePathSink)
.sink()
.connectAddress("localhost", BASE_PORT + 3)
.build();
final PriceWriter pw = new PriceWriter(source.createAppender());
final AtomicInteger count = new AtomicInteger();
final PriceReader reader = new PriceReader(sink.createTailer(), new PriceListener() {
@Override
public void onPrice(long timeInMicros, String symbol, double bp, int bq, double ap, int aq) {
count.incrementAndGet();
}
});
pw.onPrice(1, "symbol", 99.9, 1, 100.1, 2);
assertEquals(-1, reader.excerpt.index());
reader.read();
assertEquals(0, reader.excerpt.index());
long start = System.nanoTime();
int prices = 2 * 1000 * 1000;
for (int i = 1; i <= prices; i++) {
pw.onPrice(i, "symbol", 99.9, i, 100.1, i + 1);
}
long mid = System.nanoTime();
while (count.get() < prices) {
reader.read();
}
long end = System.nanoTime();
System.out.printf("Took an average of %.2f us to write and %.2f us to read using Excerpt%n",
(mid - start) / prices / 1e3, (end - mid) / prices / 1e3);
source.close();
sink.close();
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@NotNull
private WireStore acquireStore(final long cycle, final long epoch) {
@NotNull final RollCycle rollCycle = builder.rollCycle();
@NotNull final String cycleFormat = this.dateCache.formatFor(cycle);
@NotNull final File cycleFile = new File(this.builder.path(), cycleFormat + SUFFIX);
try {
final File parentFile = cycleFile.getParentFile();
if (parentFile != null && !parentFile.exists()) {
parentFile.mkdirs();
}
final WireType wireType = builder.wireType();
final MappedBytes mappedBytes = mappedBytes(builder, cycleFile);
//noinspection PointlessBitwiseExpression
if (mappedBytes.compareAndSwapInt(0, Wires.NOT_INITIALIZED, Wires.META_DATA
| Wires.NOT_READY | Wires.UNKNOWN_LENGTH)) {
final SingleChronicleQueueStore wireStore = new
SingleChronicleQueueStore(rollCycle, wireType, mappedBytes, epoch);
final Bytes<?> bytes = mappedBytes.bytesForWrite().writePosition(4);
wireType.apply(bytes).getValueOut().typedMarshallable(wireStore);
final long length = bytes.writePosition();
final WiredBytes<WireStore> wiredBytes = new WiredBytes<>(wireType, mappedBytes, wireStore, length, true);
wiredBytes.delegate().install(
wiredBytes.headerLength(),
wiredBytes.headerCreated(),
cycle,
builder
);
mappedBytes.writeOrderedInt(0L, Wires.META_DATA | Wires.toIntU30(bytes.writePosition() - 4, "Delegate too large"));
return wiredBytes.delegate();
} else {
long end = System.currentTimeMillis() + TIMEOUT;
while ((mappedBytes.readVolatileInt(0) & Wires.NOT_READY) == Wires.NOT_READY) {
if (System.currentTimeMillis() > end) {
throw new IllegalStateException("Timed out waiting for the header record to be ready in " + cycleFile);
}
Jvm.pause(1);
}
mappedBytes.readPosition(0);
mappedBytes.writePosition(mappedBytes.capacity());
final int len = Wires.lengthOf(mappedBytes.readVolatileInt());
final long length = mappedBytes.readPosition() + len;
mappedBytes.readLimit(length);
//noinspection unchecked
final WireStore wireStore = wireType.apply(mappedBytes).getValueIn().typedMarshallable();
final WiredBytes<WireStore> wiredBytes = new WiredBytes<>(wireType, mappedBytes, wireStore, length, false);
wiredBytes.delegate().install(
wiredBytes.headerLength(),
wiredBytes.headerCreated(),
cycle,
builder);
return wiredBytes.delegate();
}
} catch (FileNotFoundException e) {
throw Jvm.rethrow(e);
}
}
#location 37
#vulnerability type RESOURCE_LEAK
|
#fixed code
@NotNull
private WireStore acquireStore(final long cycle, final long epoch) {
@NotNull final RollCycle rollCycle = builder.rollCycle();
@NotNull final String cycleFormat = this.dateCache.formatFor(cycle);
@NotNull final File cycleFile = new File(this.builder.path(), cycleFormat + SUFFIX);
try {
final File parentFile = cycleFile.getParentFile();
if (parentFile != null && !parentFile.exists()) {
parentFile.mkdirs();
}
final WireType wireType = builder.wireType();
final MappedBytes mappedBytes = mappedBytes(builder, cycleFile);
//noinspection PointlessBitwiseExpression
if (mappedBytes.compareAndSwapInt(0, Wires.NOT_INITIALIZED, Wires.META_DATA
| Wires.NOT_READY | Wires.UNKNOWN_LENGTH)) {
final SingleChronicleQueueStore wireStore = new
SingleChronicleQueueStore(rollCycle, wireType, mappedBytes, epoch);
final Bytes<?> bytes = mappedBytes.bytesForWrite().writePosition(4);
wireType.apply(bytes).getValueOut().typedMarshallable(wireStore);
final long length = bytes.writePosition();
wireStore.install(
length,
true,
cycle,
builder
);
mappedBytes.writeOrderedInt(0L, Wires.META_DATA | Wires.toIntU30(bytes.writePosition() - 4, "Delegate too large"));
return wireStore;
} else {
long end = System.currentTimeMillis() + TIMEOUT;
while ((mappedBytes.readVolatileInt(0) & Wires.NOT_READY) == Wires.NOT_READY) {
if (System.currentTimeMillis() > end) {
throw new IllegalStateException("Timed out waiting for the header record to be ready in " + cycleFile);
}
Jvm.pause(1);
}
mappedBytes.readPosition(0);
mappedBytes.writePosition(mappedBytes.capacity());
final int len = Wires.lengthOf(mappedBytes.readVolatileInt());
final long length = mappedBytes.readPosition() + len;
mappedBytes.readLimit(length);
//noinspection unchecked
final WireStore wireStore = wireType.apply(mappedBytes).getValueIn().typedMarshallable();
wireStore.install(length, false, cycle, builder);
return wireStore;
}
} catch (FileNotFoundException e) {
throw Jvm.rethrow(e);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
private static void unlock(@NotNull String dir) {
File path = new File(dir);
if (!path.isDirectory()) {
System.err.println("Path argument must be a queue directory");
System.exit(1);
}
File storeFilePath = new File(path, QUEUE_METADATA_FILE);
if (!storeFilePath.exists()) {
System.err.println("Metadata file not found, nothing to unlock");
System.exit(0);
}
TableStore store = SingleTableBuilder.binary(storeFilePath, Metadata.NoMeta.INSTANCE).readOnly(false).build();
TSQueueLock queueLock = new TSQueueLock(store, BusyTimedPauser::new, 0L);
// writeLock AKA appendLock
TableStoreWriteLock writeLock = new TableStoreWriteLock(store, BusyTimedPauser::new, 0L);
forceUnlock(queueLock);
forceUnlock(writeLock);
System.out.println("Done");
}
#location 20
#vulnerability type RESOURCE_LEAK
|
#fixed code
private static void unlock(@NotNull String dir) {
File path = new File(dir);
if (!path.isDirectory()) {
System.err.println("Path argument must be a queue directory");
System.exit(1);
}
File storeFilePath = new File(path, QUEUE_METADATA_FILE);
if (!storeFilePath.exists()) {
System.err.println("Metadata file not found, nothing to unlock");
System.exit(0);
}
final TableStore<?> store = SingleTableBuilder.binary(storeFilePath, Metadata.NoMeta.INSTANCE).readOnly(false).build();
// appender lock
(new TableStoreWriteLock(store, BusyTimedPauser::new, 0L, "chronicle.append.lock")).forceUnlockLockAndDontWarn();
// write lock
(new TableStoreWriteLock(store, BusyTimedPauser::new, 0L)).forceUnlockLockAndDontWarn();
System.out.println("Done");
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testPersistedLocalIndexedSink_001() throws Exception {
final int port = BASE_PORT + 201;
final String basePath = getIndexedTestPath();
final Chronicle chronicle = ChronicleQueueBuilder.indexed(basePath).build();
final ChronicleSource source = new ChronicleSource(chronicle, port);
final Chronicle sink = localChronicleSink(chronicle, "localhost", port);
final CountDownLatch latch = new CountDownLatch(5);
final Random random = new Random();
final int items = 100;
try {
Thread appenderThread = new Thread() {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (long i = 1; i <= items; i++) {
if (latch.getCount() > 0) {
latch.countDown();
}
appender.startExcerpt(8);
appender.writeLong(i);
appender.finish();
sleep(10 + random.nextInt(80));
}
appender.close();
} catch (Exception e) {
}
}
};
appenderThread.start();
latch.await();
final ExcerptTailer tailer1 = sink.createTailer().toStart();
for (long i = 1; i <= items; i++) {
assertTrue(tailer1.nextIndex());
assertEquals(i - 1, tailer1.index());
assertEquals(i, tailer1.readLong());
tailer1.finish();
}
tailer1.close();
appenderThread.join();
sink.close();
sink.clear();
} finally {
source.close();
source.clear();
}
}
#location 55
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testPersistedLocalIndexedSink_001() throws Exception {
final int port = BASE_PORT + 201;
final String basePath = getIndexedTestPath();
final Chronicle chronicle = ChronicleQueueBuilder.indexed(basePath).build();
final Chronicle source = ChronicleQueueBuilder.source(chronicle)
.bindAddress("localhost", port)
.build();
final Chronicle sink = ChronicleQueueBuilder.sink(chronicle)
.sharedChronicle(true)
.connectAddress("localhost", port)
.build();
final CountDownLatch latch = new CountDownLatch(5);
final Random random = new Random();
final int items = 100;
try {
Thread appenderThread = new Thread() {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (long i = 1; i <= items; i++) {
if (latch.getCount() > 0) {
latch.countDown();
}
appender.startExcerpt(8);
appender.writeLong(i);
appender.finish();
sleep(10 + random.nextInt(80));
}
appender.close();
} catch (Exception e) {
}
}
};
appenderThread.start();
latch.await();
final ExcerptTailer tailer1 = sink.createTailer().toStart();
for (long i = 1; i <= items; i++) {
assertTrue(tailer1.nextIndex());
assertEquals(i - 1, tailer1.index());
assertEquals(i, tailer1.readLong());
tailer1.finish();
}
tailer1.close();
appenderThread.join();
sink.close();
sink.clear();
} finally {
source.close();
source.clear();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testOverTCP() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
// NOTE: the sink and source must have different chronicle files.
// TODO, make more robust.
final int messages = 5 * 1000 * 1000;
final Chronicle source = new ChronicleSource(ChronicleQueueBuilder.indexed(basePathSource).build(), PORT + 1);
final Chronicle sink = new ChronicleSink(ChronicleQueueBuilder.indexed(basePathSink).build(), "localhost", PORT + 1);
Thread t = new Thread(new Runnable() {
@Override
public void run() {
try {
ExcerptAppender excerpt = source.createAppender();
for (int i = 1; i <= messages; i++) {
// use a size which will cause mis-alignment.
excerpt.startExcerpt();
excerpt.writeLong(i);
excerpt.append(' ');
excerpt.append(i);
excerpt.append('\n');
excerpt.finish();
}
System.out.println(System.currentTimeMillis() + ": Finished writing messages");
} catch (Exception e) {
throw new AssertionError(e);
}
}
});
long start = System.nanoTime();
t.start();
ExcerptTailer excerpt = sink.createTailer();
int count = 0;
for (int i = 1; i <= messages; i++) {
while (!excerpt.nextIndex()) {
count++;
}
long n = excerpt.readLong();
String text = excerpt.parseUTF(StopCharTesters.CONTROL_STOP);
if (i != n) {
assertEquals('\'' + text + '\'', i, n);
}
excerpt.finish();
}
sink.close();
System.out.println("There were " + count + " InSynk messages");
t.join();
source.close();
long time = System.nanoTime() - start;
System.out.printf("Messages per second %,d%n", (int) (messages * 1e9 / time));
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
#location 26
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testOverTCP() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
// NOTE: the sink and source must have different chronicle files.
// TODO, make more robust.
final int messages = 5 * 1000 * 1000;
final Chronicle source = ChronicleQueueBuilder.indexed(basePathSource)
.source()
.bindAddress(BASE_PORT + 1)
.build();
final Chronicle sink = ChronicleQueueBuilder.indexed(basePathSink)
.sink()
.connectAddress("localhost", BASE_PORT + 1)
.build();
Thread t = new Thread(new Runnable() {
@Override
public void run() {
try {
ExcerptAppender excerpt = source.createAppender();
for (int i = 1; i <= messages; i++) {
// use a size which will cause mis-alignment.
excerpt.startExcerpt();
excerpt.writeLong(i);
excerpt.append(' ');
excerpt.append(i);
excerpt.append('\n');
excerpt.finish();
}
System.out.println(System.currentTimeMillis() + ": Finished writing messages");
} catch (Exception e) {
throw new AssertionError(e);
}
}
});
long start = System.nanoTime();
t.start();
ExcerptTailer excerpt = sink.createTailer();
int count = 0;
for (int i = 1; i <= messages; i++) {
while (!excerpt.nextIndex()) {
count++;
}
long n = excerpt.readLong();
String text = excerpt.parseUTF(StopCharTesters.CONTROL_STOP);
if (i != n) {
assertEquals('\'' + text + '\'', i, n);
}
excerpt.finish();
}
sink.close();
System.out.println("There were " + count + " InSynk messages");
t.join();
source.close();
long time = System.nanoTime() - start;
System.out.printf("Messages per second %,d%n", (int) (messages * 1e9 / time));
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@NotNull
private WireStore acquireStore(final long cycle, final long epoch) {
@NotNull final RollCycle rollCycle = builder.rollCycle();
@NotNull final String cycleFormat = this.dateCache.formatFor(cycle);
@NotNull final File cycleFile = new File(this.builder.path(), cycleFormat + SUFFIX);
try {
final File parentFile = cycleFile.getParentFile();
if (parentFile != null && !parentFile.exists()) {
parentFile.mkdirs();
}
final WireType wireType = builder.wireType();
final MappedBytes mappedBytes = mappedBytes(builder, cycleFile);
//noinspection PointlessBitwiseExpression
if (mappedBytes.compareAndSwapInt(0, Wires.NOT_INITIALIZED, Wires.META_DATA
| Wires.NOT_READY | Wires.UNKNOWN_LENGTH)) {
final SingleChronicleQueueStore wireStore = new
SingleChronicleQueueStore(rollCycle, wireType, mappedBytes, epoch);
final Bytes<?> bytes = mappedBytes.bytesForWrite().writePosition(4);
wireType.apply(bytes).getValueOut().typedMarshallable(wireStore);
final long length = bytes.writePosition();
final WiredBytes<WireStore> wiredBytes = new WiredBytes<>(wireType, mappedBytes, wireStore, length, true);
wiredBytes.delegate().install(
wiredBytes.headerLength(),
wiredBytes.headerCreated(),
cycle,
builder
);
mappedBytes.writeOrderedInt(0L, Wires.META_DATA | Wires.toIntU30(bytes.writePosition() - 4, "Delegate too large"));
return wiredBytes.delegate();
} else {
long end = System.currentTimeMillis() + TIMEOUT;
while ((mappedBytes.readVolatileInt(0) & Wires.NOT_READY) == Wires.NOT_READY) {
if (System.currentTimeMillis() > end) {
throw new IllegalStateException("Timed out waiting for the header record to be ready in " + cycleFile);
}
Jvm.pause(1);
}
mappedBytes.readPosition(0);
mappedBytes.writePosition(mappedBytes.capacity());
final int len = Wires.lengthOf(mappedBytes.readVolatileInt());
final long length = mappedBytes.readPosition() + len;
mappedBytes.readLimit(length);
//noinspection unchecked
final WireStore wireStore = wireType.apply(mappedBytes).getValueIn().typedMarshallable();
final WiredBytes<WireStore> wiredBytes = new WiredBytes<>(wireType, mappedBytes, wireStore, length, false);
wiredBytes.delegate().install(
wiredBytes.headerLength(),
wiredBytes.headerCreated(),
cycle,
builder);
return wiredBytes.delegate();
}
} catch (FileNotFoundException e) {
throw Jvm.rethrow(e);
}
}
#location 37
#vulnerability type RESOURCE_LEAK
|
#fixed code
@NotNull
private WireStore acquireStore(final long cycle, final long epoch) {
@NotNull final RollCycle rollCycle = builder.rollCycle();
@NotNull final String cycleFormat = this.dateCache.formatFor(cycle);
@NotNull final File cycleFile = new File(this.builder.path(), cycleFormat + SUFFIX);
try {
final File parentFile = cycleFile.getParentFile();
if (parentFile != null && !parentFile.exists()) {
parentFile.mkdirs();
}
final WireType wireType = builder.wireType();
final MappedBytes mappedBytes = mappedBytes(builder, cycleFile);
//noinspection PointlessBitwiseExpression
if (mappedBytes.compareAndSwapInt(0, Wires.NOT_INITIALIZED, Wires.META_DATA
| Wires.NOT_READY | Wires.UNKNOWN_LENGTH)) {
final SingleChronicleQueueStore wireStore = new
SingleChronicleQueueStore(rollCycle, wireType, mappedBytes, epoch);
final Bytes<?> bytes = mappedBytes.bytesForWrite().writePosition(4);
wireType.apply(bytes).getValueOut().typedMarshallable(wireStore);
final long length = bytes.writePosition();
wireStore.install(
length,
true,
cycle,
builder
);
mappedBytes.writeOrderedInt(0L, Wires.META_DATA | Wires.toIntU30(bytes.writePosition() - 4, "Delegate too large"));
return wireStore;
} else {
long end = System.currentTimeMillis() + TIMEOUT;
while ((mappedBytes.readVolatileInt(0) & Wires.NOT_READY) == Wires.NOT_READY) {
if (System.currentTimeMillis() > end) {
throw new IllegalStateException("Timed out waiting for the header record to be ready in " + cycleFile);
}
Jvm.pause(1);
}
mappedBytes.readPosition(0);
mappedBytes.writePosition(mappedBytes.capacity());
final int len = Wires.lengthOf(mappedBytes.readVolatileInt());
final long length = mappedBytes.readPosition() + len;
mappedBytes.readLimit(length);
//noinspection unchecked
final WireStore wireStore = wireType.apply(mappedBytes).getValueIn().typedMarshallable();
wireStore.install(length, false, cycle, builder);
return wireStore;
}
} catch (FileNotFoundException e) {
throw Jvm.rethrow(e);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testWriteAndRead() throws Exception {
try (DirectStore allocate = DirectStore.allocate(150)) {
final BytesQueue bytesRingBuffer = new BytesQueue(allocate.bytes());
bytesRingBuffer.offer(output.clear());
Bytes poll = bytesRingBuffer.poll(input.clear());
assertEquals(EXPECTED, poll.readUTF());
}
}
#location 8
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Test
public void testWriteAndRead() throws Exception {
try (DirectStore allocate = DirectStore.allocate(150)) {
final BytesRingBuffer bytesRingBuffer = new BytesRingBuffer(allocate.bytes());
bytesRingBuffer.offer(output.clear());
Bytes actual = bytesRingBuffer.take(maxSize -> input.clear());
assertEquals(EXPECTED, actual.readUTF());
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public long exceptsPerCycle(int cycle) {
StoreTailer tailer = acquireTailer();
try {
long index = rollCycle.toIndex(cycle, 0);
if (tailer.moveToIndex(index)) {
assert tailer.store.refCount() > 0;
return tailer.store.lastSequenceNumber(tailer) + 1;
} else {
return -1;
}
} catch (StreamCorruptedException e) {
throw new IllegalStateException(e);
} finally {
tailer.release();
}
}
#location 6
#vulnerability type NULL_DEREFERENCE
|
#fixed code
public long exceptsPerCycle(int cycle) {
StoreTailer tailer = acquireTailer();
try {
long index = rollCycle.toIndex(cycle, 0);
if (tailer.moveToIndex(index)) {
assert tailer.store != null && tailer.store.refCount() > 0;
return tailer.store.lastSequenceNumber(tailer) + 1;
} else {
return -1;
}
} catch (StreamCorruptedException e) {
throw new IllegalStateException(e);
} finally {
tailer.release();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testReplication1() throws IOException {
final int RUNS = 100;
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
final ChronicleSource source = new ChronicleSource(new VanillaChronicle(sourceBasePath), 0);
final ChronicleSink sink = new ChronicleSink(new VanillaChronicle(sinkBasePath), "localhost", source.getLocalPort());
try {
final ExcerptAppender appender = source.createAppender();
final ExcerptTailer tailer = sink.createTailer();
for (int i = 0; i < RUNS; i++) {
appender.startExcerpt();
long value = 1000000000 + i;
appender.append(value).append(' ');
appender.finish();
while(!tailer.nextIndex());
long val = tailer.parseLong();
//System.out.println("" + val);
assertEquals("i: " + i, value, val);
assertEquals("i: " + i, 0, tailer.remaining());
tailer.finish();
}
appender.close();
tailer.close();
} finally {
sink.close();
sink.checkCounts(1, 1);
sink.clear();
source.close();
source.checkCounts(1, 1);
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
}
#location 34
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testReplication1() throws Exception {
final int RUNS = 100;
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
final ChronicleSource source = new ChronicleSource(
new VanillaChronicle(sourceBasePath), 0);
final ChronicleSink sink = new ChronicleSink(
new VanillaChronicle(sinkBasePath), "localhost", source.getLocalPort());
try {
final Thread at = new Thread("th-appender") {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (int i = 0; i < RUNS; i++) {
appender.startExcerpt();
long value = 1000000000 + i;
appender.append(value).append(' ');
appender.finish();
}
appender.close();
} catch(Exception e) {
}
}
};
final Thread tt = new Thread("th-tailer") {
public void run() {
try {
final ExcerptTailer tailer = sink.createTailer();
for (int i = 0; i < RUNS; i++) {
long value = 1000000000 + i;
assertTrue(tailer.nextIndex());
long val = tailer.parseLong();
assertEquals("i: " + i, value, val);
assertEquals("i: " + i, 0, tailer.remaining());
tailer.finish();
}
tailer.close();
} catch(Exception e) {
}
}
};
at.start();
tt.start();
at.join();
tt.join();
} finally {
sink.close();
sink.clear();
source.close();
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testReplication1() throws Exception {
final int RUNS = 100;
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
final ChronicleSource source = new ChronicleSource(
ChronicleQueueBuilder.vanilla(sourceBasePath).build(), 0);
final ChronicleSink sink = new ChronicleSink(
ChronicleQueueBuilder.vanilla(sinkBasePath).build(), "localhost", source.getLocalPort());
try {
final Thread at = new Thread("th-appender") {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (int i = 0; i < RUNS; i++) {
appender.startExcerpt();
long value = 1000000000 + i;
appender.append(value).append(' ');
appender.finish();
}
appender.close();
} catch(Exception e) {
}
}
};
final Thread tt = new Thread("th-tailer") {
public void run() {
try {
final ExcerptTailer tailer = sink.createTailer();
for (int i = 0; i < RUNS; i++) {
long value = 1000000000 + i;
assertTrue(tailer.nextIndex());
long val = tailer.parseLong();
assertEquals("i: " + i, value, val);
assertEquals("i: " + i, 0, tailer.remaining());
tailer.finish();
}
tailer.close();
} catch(Exception e) {
}
}
};
at.start();
tt.start();
at.join();
tt.join();
} finally {
sink.close();
sink.clear();
source.close();
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
}
#location 59
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testReplication1() throws Exception {
final int RUNS = 100;
final String sourceBasePath = getVanillaTestPath("-source");
final String sinkBasePath = getVanillaTestPath("-sink");
final Chronicle source = ChronicleQueueBuilder.vanilla(sourceBasePath)
.source()
.bindAddress("localhost", BASE_PORT + 101)
.build();
final Chronicle sink = ChronicleQueueBuilder.vanilla(sinkBasePath)
.sink()
.connectAddress("localhost", BASE_PORT + 101)
.build();
try {
final Thread at = new Thread("th-appender") {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (int i = 0; i < RUNS; i++) {
appender.startExcerpt();
long value = 1000000000 + i;
appender.append(value).append(' ');
appender.finish();
}
appender.close();
} catch(Exception e) {
}
}
};
final Thread tt = new Thread("th-tailer") {
public void run() {
try {
final ExcerptTailer tailer = sink.createTailer();
for (int i = 0; i < RUNS; i++) {
long value = 1000000000 + i;
assertTrue(tailer.nextIndex());
long val = tailer.parseLong();
assertEquals("i: " + i, value, val);
assertEquals("i: " + i, 0, tailer.remaining());
tailer.finish();
}
tailer.close();
} catch(Exception e) {
}
}
};
at.start();
tt.start();
at.join();
tt.join();
} finally {
sink.close();
sink.clear();
source.close();
source.clear();
assertFalse(new File(sourceBasePath).exists());
assertFalse(new File(sinkBasePath).exists());
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testPricePublishing3() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
final Chronicle source = new ChronicleSource(ChronicleQueueBuilder.indexed(basePathSource).build(), PORT + 4);
final Chronicle sink = new ChronicleSink(ChronicleQueueBuilder.indexed(basePathSink).build(), "localhost", PORT + 4);
final PriceWriter pw = new PriceWriter(source.createAppender());
final AtomicInteger count = new AtomicInteger();
PriceReader reader = new PriceReader(sink.createTailer(), new PriceListener() {
@Override
public void onPrice(long timeInMicros, String symbol, double bp, int bq, double ap, int aq) {
count.incrementAndGet();
}
});
pw.onPrice(1, "symbol", 99.9, 1, 100.1, 2);
assertEquals(-1, reader.excerpt.index());
reader.read();
assertEquals(0, reader.excerpt.index());
long start = System.nanoTime();
int prices = 2 * 1000 * 1000;
for (int i = 1; i <= prices; i++) {
pw.onPrice(i, "symbol", 99.9, i, 100.1, i + 1);
}
long mid = System.nanoTime();
while (count.get() < prices)
reader.read();
long end = System.nanoTime();
System.out.printf("Took an average of %.2f us to write and %.2f us to read using Tailer%n",
(mid - start) / prices / 1e3, (end - mid) / prices / 1e3);
source.close();
sink.close();
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
#location 15
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testPricePublishing3() throws IOException, InterruptedException {
final String basePathSource = getIndexedTestPath("-source");
final String basePathSink = getIndexedTestPath("-sink");
final Chronicle source = ChronicleQueueBuilder.indexed(basePathSource)
.source()
.bindAddress(BASE_PORT + 4)
.build();
final Chronicle sink = ChronicleQueueBuilder.indexed(basePathSink)
.sink()
.connectAddress("localhost", BASE_PORT + 4)
.build();
final PriceWriter pw = new PriceWriter(source.createAppender());
final AtomicInteger count = new AtomicInteger();
PriceReader reader = new PriceReader(sink.createTailer(), new PriceListener() {
@Override
public void onPrice(long timeInMicros, String symbol, double bp, int bq, double ap, int aq) {
count.incrementAndGet();
}
});
pw.onPrice(1, "symbol", 99.9, 1, 100.1, 2);
assertEquals(-1, reader.excerpt.index());
reader.read();
assertEquals(0, reader.excerpt.index());
long start = System.nanoTime();
int prices = 2 * 1000 * 1000;
for (int i = 1; i <= prices; i++) {
pw.onPrice(i, "symbol", 99.9, i, 100.1, i + 1);
}
long mid = System.nanoTime();
while (count.get() < prices)
reader.read();
long end = System.nanoTime();
System.out.printf("Took an average of %.2f us to write and %.2f us to read using Tailer%n",
(mid - start) / prices / 1e3, (end - mid) / prices / 1e3);
source.close();
sink.close();
assertIndexedClean(basePathSource);
assertIndexedClean(basePathSink);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
int lastIndexFile(int cycle, int defaultCycle) {
int maxIndex = -1;
final File cyclePath = new File(baseFile, dateCache.formatFor(cycle));
final File[] files = cyclePath.listFiles();
if (files != null) {
for (final File file : files) {
String name = file.getName();
if (name.startsWith(FILE_NAME_PREFIX)) {
int index = Integer.parseInt(name.substring(FILE_NAME_PREFIX.length()));
if (maxIndex < index) {
maxIndex = index;
}
}
}
}
return maxIndex != -1 ? maxIndex : defaultCycle;
}
#location 4
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
int lastIndexFile(int cycle) {
return lastIndexFile(cycle, 0);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public synchronized LongValue acquireValueFor(CharSequence key) {
StringBuilder sb = Wires.acquireStringBuilder();
mappedBytes.reserve();
try {
mappedBytes.readPosition(0);
mappedBytes.readLimit(mappedBytes.realCapacity());
while (mappedWire.readDataHeader()) {
int header = mappedBytes.readInt();
if (Wires.isNotComplete(header))
break;
long readPosition = mappedBytes.readPosition();
int length = Wires.lengthOf(header);
ValueIn valueIn = mappedWire.readEventName(sb);
if (StringUtils.equalsCaseIgnore(key, sb)) {
return valueIn.int64ForBinding(null);
}
mappedBytes.readPosition(readPosition + length);
}
// not found
int safeLength = Maths.toUInt31(mappedBytes.realCapacity() - mappedBytes.readPosition());
mappedBytes.writeLimit(mappedBytes.realCapacity());
mappedBytes.writePosition(mappedBytes.readPosition());
long pos = recovery.writeHeader(mappedWire, Wires.UNKNOWN_LENGTH, safeLength, 10_000, null);
LongValue longValue = wireType.newLongReference().get();
mappedWire.writeEventName(key).int64forBinding(Long.MIN_VALUE, longValue);
mappedWire.updateHeader(pos, false);
return longValue;
} catch (StreamCorruptedException | EOFException e) {
throw new IORuntimeException(e);
} finally {
mappedBytes.release();
}
}
#location 24
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Override
public synchronized LongValue acquireValueFor(CharSequence key) {
StringBuilder sb = Wires.acquireStringBuilder();
mappedBytes.reserve();
try {
mappedBytes.readPosition(0);
mappedBytes.readLimit(mappedBytes.realCapacity());
while (mappedWire.readDataHeader()) {
int header = mappedBytes.readInt();
if (Wires.isNotComplete(header))
break;
long readPosition = mappedBytes.readPosition();
int length = Wires.lengthOf(header);
ValueIn valueIn = mappedWire.readEventName(sb);
if (StringUtils.equalsCaseIgnore(key, sb)) {
return valueIn.int64ForBinding(null);
}
mappedBytes.readPosition(readPosition + length);
}
// not found
int safeLength = Maths.toUInt31(mappedBytes.realCapacity() - mappedBytes.readPosition());
mappedBytes.writeLimit(mappedBytes.realCapacity());
mappedBytes.writePosition(mappedBytes.readPosition());
long pos = recovery.writeHeader(mappedWire, Wires.UNKNOWN_LENGTH, safeLength, timeoutMS, null);
LongValue longValue = wireType.newLongReference().get();
mappedWire.writeEventName(key).int64forBinding(Long.MIN_VALUE, longValue);
mappedWire.updateHeader(pos, false);
return longValue;
} catch (StreamCorruptedException | EOFException e) {
throw new IORuntimeException(e);
} finally {
mappedBytes.release();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
private static void unlock(@NotNull String dir) {
File path = new File(dir);
if (!path.isDirectory()) {
System.err.println("Path argument must be a queue directory");
System.exit(1);
}
File storeFilePath = new File(path, QUEUE_METADATA_FILE);
if (!storeFilePath.exists()) {
System.err.println("Metadata file not found, nothing to unlock");
System.exit(0);
}
TableStore store = SingleTableBuilder.binary(storeFilePath, Metadata.NoMeta.INSTANCE).readOnly(false).build();
TSQueueLock queueLock = new TSQueueLock(store, BusyTimedPauser::new, 0L);
// writeLock AKA appendLock
TableStoreWriteLock writeLock = new TableStoreWriteLock(store, BusyTimedPauser::new, 0L);
forceUnlock(queueLock);
forceUnlock(writeLock);
System.out.println("Done");
}
#location 21
#vulnerability type RESOURCE_LEAK
|
#fixed code
private static void unlock(@NotNull String dir) {
File path = new File(dir);
if (!path.isDirectory()) {
System.err.println("Path argument must be a queue directory");
System.exit(1);
}
File storeFilePath = new File(path, QUEUE_METADATA_FILE);
if (!storeFilePath.exists()) {
System.err.println("Metadata file not found, nothing to unlock");
System.exit(0);
}
final TableStore<?> store = SingleTableBuilder.binary(storeFilePath, Metadata.NoMeta.INSTANCE).readOnly(false).build();
// appender lock
(new TableStoreWriteLock(store, BusyTimedPauser::new, 0L, "chronicle.append.lock")).forceUnlockLockAndDontWarn();
// write lock
(new TableStoreWriteLock(store, BusyTimedPauser::new, 0L)).forceUnlockLockAndDontWarn();
System.out.println("Done");
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testPersistedLocalVanillaSink_001() throws Exception {
final int port = BASE_PORT + 301;
final String basePath = getVanillaTestPath();
final Chronicle chronicle = ChronicleQueueBuilder.vanilla(basePath).build();
final ChronicleSource source = new ChronicleSource(chronicle, port);
final Chronicle sink = localChronicleSink(chronicle, "localhost", port);
final CountDownLatch latch = new CountDownLatch(5);
final Random random = new Random();
final int items = 100;
try {
Thread appenderThread = new Thread() {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (long i = 1; i <= items; i++) {
if (latch.getCount() > 0) {
latch.countDown();
}
appender.startExcerpt(8);
appender.writeLong(i);
appender.finish();
sleep(10 + random.nextInt(80));
appender.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
};
appenderThread.start();
latch.await();
final ExcerptTailer tailer1 = sink.createTailer().toStart();
for (long i = 1; i <= items; i++) {
assertTrue(tailer1.nextIndex());
assertEquals(i, tailer1.readLong());
tailer1.finish();
}
tailer1.close();
appenderThread.join();
sink.close();
sink.clear();
} finally {
source.close();
source.clear();
}
}
#location 56
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testPersistedLocalVanillaSink_001() throws Exception {
final int port = BASE_PORT + 301;
final String basePath = getVanillaTestPath();
final Chronicle chronicle = ChronicleQueueBuilder.vanilla(basePath).build();
final Chronicle source = ChronicleQueueBuilder.source(chronicle)
.bindAddress("localhost", port)
.build();
final Chronicle sink = ChronicleQueueBuilder.sink(chronicle)
.sharedChronicle(true)
.connectAddress("localhost",port)
.build();
final CountDownLatch latch = new CountDownLatch(5);
final Random random = new Random();
final int items = 100;
try {
Thread appenderThread = new Thread() {
public void run() {
try {
final ExcerptAppender appender = source.createAppender();
for (long i = 1; i <= items; i++) {
if (latch.getCount() > 0) {
latch.countDown();
}
appender.startExcerpt(8);
appender.writeLong(i);
appender.finish();
sleep(10 + random.nextInt(80));
appender.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
};
appenderThread.start();
latch.await();
final ExcerptTailer tailer1 = sink.createTailer().toStart();
for (long i = 1; i <= items; i++) {
assertTrue(tailer1.nextIndex());
assertEquals(i, tailer1.readLong());
tailer1.finish();
}
tailer1.close();
appenderThread.join();
sink.close();
sink.clear();
} finally {
source.close();
source.clear();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Before
public void setup() {
final Bytes out = new ByteBufferBytes(ByteBuffer.allocate(22));
out.writeUTF(EXPECTED);
output = out.flip().slice();
}
#location 5
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Before
public void setup() {
final Bytes out = ByteBufferBytes.wrap(ByteBuffer.allocate(22));
out.writeUTF(EXPECTED);
output = out.flip().slice();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testOneAtATime() throws IOException {
ChronicleConfig config = ChronicleConfig.TEST.clone();
config.indexBlockSize(128); // very small
config.dataBlockSize(128); // very small
final String basePath = TMP + "/testOneAtATime";
ChronicleTools.deleteOnExit(basePath);
File indexFile = new File(basePath + ".index");
for (int i = 0; i < 100; i++) {
if (i % 10 == 0)
System.out.println("i: " + i);
long indexFileSize = indexFile.length();
IndexedChronicle chronicle = new IndexedChronicle(basePath);
assertEquals("Index should not grow on open (i=" + i + ")", indexFileSize, indexFile.length());
if (i == 0) {
ExcerptTailer tailer = chronicle.createTailer();
assertFalse(tailer.nextIndex());
Excerpt excerpt = chronicle.createExcerpt();
assertFalse(excerpt.index(0));
}
ExcerptAppender appender = chronicle.createAppender();
appender.startExcerpt();
appender.writeDouble(i);
appender.finish();
// ChronicleIndexReader.main(basePath+".index");
ExcerptTailer tailer = chronicle.createTailer();
long[] indexes = new long[i + 1];
long lastIndex = -1;
for (int j = 0; j <= i; j++) {
assertTrue(tailer.nextIndex());
assertTrue(tailer.index() + " > " + lastIndex, tailer.index() > lastIndex);
lastIndex = tailer.index();
double d = tailer.readDouble();
assertEquals(j, d, 0.0);
assertEquals(0, tailer.remaining());
indexes[j] = tailer.index();
tailer.finish();
}
assertFalse(tailer.nextIndex());
Excerpt excerpt = chronicle.createExcerpt();
// forward
for (int j = 0; j < i; j++) {
assertTrue(excerpt.index(indexes[j]));
double d = excerpt.readDouble();
assertEquals(j, d, 0.0);
assertEquals(0, excerpt.remaining());
excerpt.finish();
}
assertFalse(excerpt.index(indexes[indexes.length - 1] + 1));
// backward
for (int j = i - 1; j >= 0; j--) {
assertTrue(excerpt.index(indexes[j]));
double d = excerpt.readDouble();
assertEquals(j, d, 0.0);
assertEquals(0, excerpt.remaining());
excerpt.finish();
}
assertFalse(excerpt.index(-1));
chronicle.close();
}
}
#location 24
#vulnerability type RESOURCE_LEAK
|
#fixed code
@Test
public void testOneAtATime() throws IOException {
ChronicleConfig config = ChronicleConfig.TEST.clone();
config.indexBlockSize(128); // very small
config.dataBlockSize(128); // very small
final String basePath = TMP + "/testOneAtATime";
ChronicleTools.deleteOnExit(basePath);
File indexFile = new File(basePath + ".index");
for (int i = 0; i < 1000; i++) {
if (i % 10 == 0)
System.out.println("i: " + i);
long indexFileSize = indexFile.length();
IndexedChronicle chronicle = new IndexedChronicle(basePath, config);
assertEquals("Index should not grow on open (i=" + i + ")", indexFileSize, indexFile.length());
if (i == 0) {
ExcerptTailer tailer = chronicle.createTailer();
assertFalse(tailer.nextIndex());
Excerpt excerpt = chronicle.createExcerpt();
assertFalse(excerpt.index(0));
}
ExcerptAppender appender = chronicle.createAppender();
appender.startExcerpt();
appender.writeDouble(i);
appender.finish();
// ChronicleIndexReader.main(basePath+".index");
ExcerptTailer tailer = chronicle.createTailer();
long[] indexes = new long[i + 1];
long lastIndex = -1;
for (int j = 0; j <= i; j++) {
assertTrue(tailer.nextIndex());
assertTrue(tailer.index() + " > " + lastIndex, tailer.index() > lastIndex);
lastIndex = tailer.index();
double d = tailer.readDouble();
assertEquals(j, d, 0.0);
assertEquals(0, tailer.remaining());
indexes[j] = tailer.index();
tailer.finish();
}
assertFalse(tailer.nextIndex());
Excerpt excerpt = chronicle.createExcerpt();
// forward
for (int j = 0; j < i; j++) {
assertTrue(excerpt.index(indexes[j]));
double d = excerpt.readDouble();
assertEquals(j, d, 0.0);
assertEquals(0, excerpt.remaining());
excerpt.finish();
}
assertFalse(excerpt.index(indexes[indexes.length - 1] + 1));
// backward
for (int j = i - 1; j >= 0; j--) {
assertTrue(excerpt.index(indexes[j]));
double d = excerpt.readDouble();
assertEquals(j, d, 0.0);
assertEquals(0, excerpt.remaining());
excerpt.finish();
}
assertFalse(excerpt.index(-1));
chronicle.close();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testWrite3read3SingleThreadedWrite() throws Exception {
try (DirectStore allocate = DirectStore.allocate(40 * 3)) {
final BytesQueue bytesRingBuffer = new BytesQueue(allocate.bytes());
for (int i = 0; i < 100; i++) {
bytesRingBuffer.offer(output.clear());
bytesRingBuffer.offer(output.clear());
bytesRingBuffer.offer(output.clear());
assertEquals(EXPECTED, bytesRingBuffer.poll(input.clear()).readUTF());
assertEquals(EXPECTED, bytesRingBuffer.poll(input.clear()).readUTF());
assertEquals(EXPECTED, bytesRingBuffer.poll(input.clear()).readUTF());
}
}
}
#location 10
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Test
public void testWrite3read3SingleThreadedWrite() throws Exception {
try (DirectStore allocate = DirectStore.allocate(40 * 3)) {
final BytesRingBuffer bytesRingBuffer = new BytesRingBuffer(allocate.bytes());
for (int i = 0; i < 100; i++) {
bytesRingBuffer.offer(output.clear());
bytesRingBuffer.offer(output.clear());
bytesRingBuffer.offer(output.clear());
assertEquals(EXPECTED, bytesRingBuffer.take(maxSize -> input.clear()).readUTF());
assertEquals(EXPECTED, bytesRingBuffer.take(maxSize -> input.clear()).readUTF());
assertEquals(EXPECTED, bytesRingBuffer.take(maxSize -> input.clear()).readUTF());
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public synchronized void release(@NotNull CommonStore store) {
store.release();
long refCount = store.refCount();
assert refCount >= 0;
if (refCount == 0) {
for (Map.Entry<RollDetails, WeakReference<WireStore>> entry : stores.entrySet()) {
WeakReference<WireStore> ref = entry.getValue();
if (ref != null && ref.get() == store) {
stores.remove(entry.getKey());
storeFileListener.onReleased(entry.getKey().cycle(), store.file());
return;
}
}
LOGGER.warn("Store was not registered {}", store.file().getName());
}
}
#location 15
#vulnerability type NULL_DEREFERENCE
|
#fixed code
public synchronized void release(@NotNull CommonStore store) {
store.release();
long refCount = store.refCount();
assert refCount >= 0;
if (refCount == 0) {
for (Map.Entry<RollDetails, WeakReference<WireStore>> entry : stores.entrySet()) {
WeakReference<WireStore> ref = entry.getValue();
if (ref != null && ref.get() == store) {
stores.remove(entry.getKey());
storeFileListener.onReleased(entry.getKey().cycle(), store.file());
return;
}
}
if (Jvm.debug().isEnabled(getClass()))
Jvm.debug().on(getClass(), "Store was not registered: " + store.file());
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
LOG.info("Receive RequestVote request from server {} " +
"in term {} (my term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.getLock().lock();
try {
Raft.VoteResponse.Builder responseBuilder = Raft.VoteResponse.newBuilder();
responseBuilder.setGranted(false);
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
raftNode.stepDown(request.getTerm());
}
boolean logIsOk = request.getLastLogTerm() > raftNode.getRaftLog().getLastLogTerm()
|| (request.getLastLogTerm() == raftNode.getRaftLog().getLastLogTerm()
&& request.getLastLogIndex() >= raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getVotedFor() == 0 && logIsOk) {
raftNode.stepDown(request.getTerm());
raftNode.setVotedFor(request.getServerId());
raftNode.getRaftLog().updateMetaData(raftNode.getCurrentTerm(), raftNode.getVotedFor(), null);
responseBuilder.setGranted(true);
responseBuilder.setTerm(raftNode.getCurrentTerm());
}
return responseBuilder.build();
} finally {
raftNode.getLock().unlock();
}
}
#location 6
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
raftNode.getLock().lock();
try {
Raft.VoteResponse.Builder responseBuilder = Raft.VoteResponse.newBuilder();
responseBuilder.setGranted(false);
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
raftNode.stepDown(request.getTerm());
}
boolean logIsOk = request.getLastLogTerm() > raftNode.getRaftLog().getLastLogTerm()
|| (request.getLastLogTerm() == raftNode.getRaftLog().getLastLogTerm()
&& request.getLastLogIndex() >= raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getVotedFor() == 0 && logIsOk) {
raftNode.stepDown(request.getTerm());
raftNode.setVotedFor(request.getServerId());
raftNode.getRaftLog().updateMetaData(raftNode.getCurrentTerm(), raftNode.getVotedFor(), null);
responseBuilder.setGranted(true);
responseBuilder.setTerm(raftNode.getCurrentTerm());
}
LOG.info("Receive RequestVote request from server {} " +
"in term {} (my term is {}), granted={}",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm(), responseBuilder.getGranted());
return responseBuilder.build();
} finally {
raftNode.getLock().unlock();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void appendEntries(Peer peer) {
long startLogIndex = raftLog.getStartLogIndex();
if (peer.getNextIndex() < startLogIndex) {
this.installSnapshot(peer);
return;
}
long lastLogIndex = this.raftLog.getLastLogIndex();
long prevLogIndex = peer.getNextIndex() - 1;
long prevLogTerm = 0;
if (prevLogIndex >= startLogIndex) {
prevLogTerm = raftLog.getEntry(prevLogIndex).getTerm();
} else if (prevLogIndex == 0) {
prevLogTerm = 0;
} else if (prevLogIndex == lastSnapshotIndex) {
prevLogTerm = lastSnapshotTerm;
} else {
installSnapshot(peer);
return;
}
Raft.AppendEntriesRequest.Builder requestBuilder = Raft.AppendEntriesRequest.newBuilder();
requestBuilder.setServerId(localServer.getServerId());
requestBuilder.setTerm(currentTerm);
requestBuilder.setPrevLogTerm(prevLogTerm);
requestBuilder.setPrevLogIndex(prevLogIndex);
long numEntries = packEntries(peer.getNextIndex(), requestBuilder);
requestBuilder.setCommitIndex(Math.min(commitIndex, prevLogIndex + numEntries));
Raft.AppendEntriesRequest request = requestBuilder.build();
Raft.AppendEntriesResponse response = peer.getRaftConsensusService().appendEntries(request);
if (response == null) {
LOG.warn("appendEntries with peer[{}:{}] failed",
peer.getServerAddress().getHost(),
peer.getServerAddress().getPort());
return;
}
if (response.getTerm() > currentTerm) {
LOG.info("Received AppendEntries response from server {} " +
"in term {} (this server's term was {})",
peer.getServerAddress().getServerId(),
response.getTerm(), currentTerm);
stepDown(response.getTerm());
} else {
if (response.getSuccess()) {
peer.setMatchIndex(prevLogIndex + numEntries);
advanceCommitIndex();
peer.setNextIndex(peer.getMatchIndex() + 1);
} else {
if (peer.getNextIndex() > 1) {
peer.setNextIndex(peer.getNextIndex() - 1);
}
if (response.getLastLogIndex() != 0
&& peer.getNextIndex() > response.getLastLogIndex() + 1) {
peer.setNextIndex(response.getLastLogIndex() + 1);
}
}
}
}
#location 15
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void appendEntries(Peer peer) {
long firstLogIndex = raftLog.getFirstLogIndex();
if (peer.getNextIndex() < firstLogIndex) {
installSnapshot(peer);
return;
}
long prevLogIndex = peer.getNextIndex() - 1;
long prevLogTerm = 0;
if (prevLogIndex >= firstLogIndex) {
prevLogTerm = raftLog.getEntry(prevLogIndex).getTerm();
} else if (prevLogIndex == 0) {
prevLogTerm = 0;
} else if (prevLogIndex == snapshot.getMetaData().getLastIncludedIndex()) {
prevLogTerm = snapshot.getMetaData().getLastIncludedTerm();
} else {
installSnapshot(peer);
return;
}
Raft.AppendEntriesRequest.Builder requestBuilder = Raft.AppendEntriesRequest.newBuilder();
requestBuilder.setServerId(localServer.getServerId());
requestBuilder.setTerm(currentTerm);
requestBuilder.setPrevLogTerm(prevLogTerm);
requestBuilder.setPrevLogIndex(prevLogIndex);
long numEntries = packEntries(peer.getNextIndex(), requestBuilder);
requestBuilder.setCommitIndex(Math.min(commitIndex, prevLogIndex + numEntries));
Raft.AppendEntriesRequest request = requestBuilder.build();
Raft.AppendEntriesResponse response = peer.getRaftConsensusService().appendEntries(request);
if (response == null) {
LOG.warn("appendEntries with peer[{}:{}] failed",
peer.getServerAddress().getHost(),
peer.getServerAddress().getPort());
return;
}
if (response.getTerm() > currentTerm) {
LOG.info("Received AppendEntries response from server {} " +
"in term {} (this server's term was {})",
peer.getServerAddress().getServerId(),
response.getTerm(), currentTerm);
stepDown(response.getTerm());
} else {
if (response.getSuccess()) {
peer.setMatchIndex(prevLogIndex + numEntries);
advanceCommitIndex();
peer.setNextIndex(peer.getMatchIndex() + 1);
} else {
if (peer.getNextIndex() > 1) {
peer.setNextIndex(peer.getNextIndex() - 1);
}
if (response.getLastLogIndex() != 0
&& peer.getNextIndex() > response.getLastLogIndex() + 1) {
peer.setNextIndex(response.getLastLogIndex() + 1);
}
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (request.getTerm() == raftNode.getCurrentTerm()) {
if ((raftNode.getVotedFor() == 0
|| raftNode.getVotedFor() == request.getServerId())
&& (raftNode.getCurrentTerm() == request.getTerm()
&& raftNode.getCommitIndex() == request.getLastLogIndex())) {
raftNode.setVotedFor(request.getServerId());
raftNode.stepDown(raftNode.getCurrentTerm());
raftNode.resetElectionTimer();
raftNode.updateMetaData();
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(true)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
}
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(false)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
#location 15
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
raftNode.getLock().lock();
Raft.VoteResponse.Builder responseBuilder = Raft.VoteResponse.newBuilder();
responseBuilder.setGranted(false);
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
boolean logIsOk = request.getLastLogTerm() > raftNode.getRaftLog().getLastLogTerm()
|| (request.getLastLogTerm() == raftNode.getRaftLog().getLastLogTerm()
&& request.getLastLogIndex() >= raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getVotedFor() == 0 || logIsOk) {
raftNode.stepDown(request.getTerm());
raftNode.setVotedFor(request.getServerId());
raftNode.updateMetaData();
responseBuilder.setGranted(true);
responseBuilder.setTerm(raftNode.getCurrentTerm());
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (request.getTerm() == raftNode.getCurrentTerm()) {
if ((raftNode.getVotedFor() == 0
|| raftNode.getVotedFor() == request.getServerId())
&& (raftNode.getCurrentTerm() == request.getTerm()
&& raftNode.getCommitIndex() == request.getLastLogIndex())) {
raftNode.setVotedFor(request.getServerId());
raftNode.stepDown(raftNode.getCurrentTerm());
raftNode.resetElectionTimer();
raftNode.updateMetaData();
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(true)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
}
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(false)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
#location 17
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
raftNode.getLock().lock();
Raft.VoteResponse.Builder responseBuilder = Raft.VoteResponse.newBuilder();
responseBuilder.setGranted(false);
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
boolean logIsOk = request.getLastLogTerm() > raftNode.getRaftLog().getLastLogTerm()
|| (request.getLastLogTerm() == raftNode.getRaftLog().getLastLogTerm()
&& request.getLastLogIndex() >= raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getVotedFor() == 0 || logIsOk) {
raftNode.stepDown(request.getTerm());
raftNode.setVotedFor(request.getServerId());
raftNode.updateMetaData();
responseBuilder.setGranted(true);
responseBuilder.setTerm(raftNode.getCurrentTerm());
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (request.getTerm() == raftNode.getCurrentTerm()) {
if ((raftNode.getVotedFor() == 0
|| raftNode.getVotedFor() == request.getServerId())
&& (raftNode.getCurrentTerm() == request.getTerm()
&& raftNode.getCommitIndex() == request.getLastLogIndex())) {
raftNode.setVotedFor(request.getServerId());
raftNode.stepDown(raftNode.getCurrentTerm());
raftNode.resetElectionTimer();
raftNode.updateMetaData();
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(true)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
}
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(false)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
#location 8
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
raftNode.getLock().lock();
Raft.VoteResponse.Builder responseBuilder = Raft.VoteResponse.newBuilder();
responseBuilder.setGranted(false);
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
boolean logIsOk = request.getLastLogTerm() > raftNode.getRaftLog().getLastLogTerm()
|| (request.getLastLogTerm() == raftNode.getRaftLog().getLastLogTerm()
&& request.getLastLogIndex() >= raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getVotedFor() == 0 || logIsOk) {
raftNode.stepDown(request.getTerm());
raftNode.setVotedFor(request.getServerId());
raftNode.updateMetaData();
responseBuilder.setGranted(true);
responseBuilder.setTerm(raftNode.getCurrentTerm());
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
responseBuilder.setTerm(request.getTerm());
}
raftNode.stepDown(request.getTerm());
raftNode.resetElectionTimer();
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// TODO: truncate segment log from index
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// TODO: apply state machine
}
return responseBuilder.build();
}
#location 21
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
raftNode.getLock().lock();
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
raftNode.getLock().unlock();
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// truncate segment log from index
long lastIndexKept = index - 1;
raftNode.getRaftLog().truncateSuffix(lastIndexKept);
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// apply state machine
for (index = raftNode.getLastAppliedIndex() + 1; index <= raftNode.getCommitIndex(); index++) {
raftNode.getStateMachine().apply(
raftNode.getRaftLog().getEntry(index).getData().toByteArray());
}
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (request.getTerm() == raftNode.getCurrentTerm()) {
if ((raftNode.getVotedFor() == 0
|| raftNode.getVotedFor() == request.getServerId())
&& (raftNode.getCurrentTerm() == request.getTerm()
&& raftNode.getCommitIndex() == request.getLastLogIndex())) {
raftNode.setVotedFor(request.getServerId());
raftNode.stepDown(raftNode.getCurrentTerm());
raftNode.resetElectionTimer();
raftNode.updateMetaData();
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(true)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
}
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(false)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
#location 16
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
raftNode.getLock().lock();
Raft.VoteResponse.Builder responseBuilder = Raft.VoteResponse.newBuilder();
responseBuilder.setGranted(false);
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
boolean logIsOk = request.getLastLogTerm() > raftNode.getRaftLog().getLastLogTerm()
|| (request.getLastLogTerm() == raftNode.getRaftLog().getLastLogTerm()
&& request.getLastLogIndex() >= raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getVotedFor() == 0 || logIsOk) {
raftNode.stepDown(request.getTerm());
raftNode.setVotedFor(request.getServerId());
raftNode.updateMetaData();
responseBuilder.setGranted(true);
responseBuilder.setTerm(raftNode.getCurrentTerm());
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
responseBuilder.setTerm(request.getTerm());
}
raftNode.stepDown(request.getTerm());
raftNode.resetElectionTimer();
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// TODO: truncate segment log from index
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// TODO: apply state machine
}
return responseBuilder.build();
}
#location 20
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
raftNode.getLock().lock();
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
raftNode.getLock().unlock();
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// truncate segment log from index
long lastIndexKept = index - 1;
raftNode.getRaftLog().truncateSuffix(lastIndexKept);
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// apply state machine
for (index = raftNode.getLastAppliedIndex() + 1; index <= raftNode.getCommitIndex(); index++) {
raftNode.getStateMachine().apply(
raftNode.getRaftLog().getEntry(index).getData().toByteArray());
}
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void replicate(byte[] data) {
Raft.LogEntry logEntry = Raft.LogEntry.newBuilder()
.setTerm(currentTerm)
.setType(Raft.EntryType.ENTRY_TYPE_DATA)
.setData(ByteString.copyFrom(data)).build();
List<Raft.LogEntry> entries = new ArrayList<>();
entries.add(logEntry);
long newLastLogIndex = raftLog.append(entries);
for (final Peer peer : peers) {
executorService.submit(new Runnable() {
@Override
public void run() {
appendEntries(peer);
}
});
}
// sync wait condition commitIndex >= newLastLogIndex
// TODO: add timeout
lock.lock();
try {
while (commitIndex < newLastLogIndex) {
try {
commitIndexCondition.await();
} catch (InterruptedException ex) {
LOG.warn(ex.getMessage());
}
}
} finally {
lock.unlock();
}
}
#location 3
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void replicate(byte[] data) {
lock.lock();
Raft.LogEntry logEntry = Raft.LogEntry.newBuilder()
.setTerm(currentTerm)
.setType(Raft.EntryType.ENTRY_TYPE_DATA)
.setData(ByteString.copyFrom(data)).build();
List<Raft.LogEntry> entries = new ArrayList<>();
entries.add(logEntry);
long newLastLogIndex = raftLog.append(entries);
for (final Peer peer : peers) {
executorService.submit(new Runnable() {
@Override
public void run() {
appendEntries(peer);
}
});
}
// sync wait condition commitIndex >= newLastLogIndex
// TODO: add timeout
try {
while (commitIndex < newLastLogIndex) {
try {
commitIndexCondition.await();
} catch (InterruptedException ex) {
LOG.warn(ex.getMessage());
}
}
} finally {
lock.unlock();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void appendEntries(Peer peer) {
long startLogIndex = raftLog.getStartLogIndex();
if (peer.getNextIndex() < startLogIndex) {
this.installSnapshot(peer);
return;
}
long lastLogIndex = this.raftLog.getLastLogIndex();
long prevLogIndex = peer.getNextIndex() - 1;
long prevLogTerm = 0;
if (prevLogIndex >= startLogIndex) {
prevLogTerm = raftLog.getEntry(prevLogIndex).getTerm();
} else if (prevLogIndex == 0) {
prevLogTerm = 0;
} else if (prevLogIndex == lastSnapshotIndex) {
prevLogTerm = lastSnapshotTerm;
} else {
installSnapshot(peer);
return;
}
Raft.AppendEntriesRequest.Builder requestBuilder = Raft.AppendEntriesRequest.newBuilder();
requestBuilder.setServerId(localServer.getServerId());
requestBuilder.setTerm(currentTerm);
requestBuilder.setPrevLogTerm(prevLogTerm);
requestBuilder.setPrevLogIndex(prevLogIndex);
long numEntries = packEntries(peer.getNextIndex(), requestBuilder);
requestBuilder.setCommitIndex(Math.min(commitIndex, prevLogIndex + numEntries));
Raft.AppendEntriesRequest request = requestBuilder.build();
Raft.AppendEntriesResponse response = peer.getRaftConsensusService().appendEntries(request);
if (response == null) {
LOG.warn("appendEntries with peer[{}:{}] failed",
peer.getServerAddress().getHost(),
peer.getServerAddress().getPort());
return;
}
if (response.getTerm() > currentTerm) {
LOG.info("Received AppendEntries response from server {} " +
"in term {} (this server's term was {})",
peer.getServerAddress().getServerId(),
response.getTerm(), currentTerm);
stepDown(response.getTerm());
} else {
if (response.getSuccess()) {
peer.setMatchIndex(prevLogIndex + numEntries);
advanceCommitIndex();
peer.setNextIndex(peer.getMatchIndex() + 1);
} else {
if (peer.getNextIndex() > 1) {
peer.setNextIndex(peer.getNextIndex() - 1);
}
if (response.getLastLogIndex() != 0
&& peer.getNextIndex() > response.getLastLogIndex() + 1) {
peer.setNextIndex(response.getLastLogIndex() + 1);
}
}
}
}
#location 16
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void appendEntries(Peer peer) {
long firstLogIndex = raftLog.getFirstLogIndex();
if (peer.getNextIndex() < firstLogIndex) {
installSnapshot(peer);
return;
}
long prevLogIndex = peer.getNextIndex() - 1;
long prevLogTerm = 0;
if (prevLogIndex >= firstLogIndex) {
prevLogTerm = raftLog.getEntry(prevLogIndex).getTerm();
} else if (prevLogIndex == 0) {
prevLogTerm = 0;
} else if (prevLogIndex == snapshot.getMetaData().getLastIncludedIndex()) {
prevLogTerm = snapshot.getMetaData().getLastIncludedTerm();
} else {
installSnapshot(peer);
return;
}
Raft.AppendEntriesRequest.Builder requestBuilder = Raft.AppendEntriesRequest.newBuilder();
requestBuilder.setServerId(localServer.getServerId());
requestBuilder.setTerm(currentTerm);
requestBuilder.setPrevLogTerm(prevLogTerm);
requestBuilder.setPrevLogIndex(prevLogIndex);
long numEntries = packEntries(peer.getNextIndex(), requestBuilder);
requestBuilder.setCommitIndex(Math.min(commitIndex, prevLogIndex + numEntries));
Raft.AppendEntriesRequest request = requestBuilder.build();
Raft.AppendEntriesResponse response = peer.getRaftConsensusService().appendEntries(request);
if (response == null) {
LOG.warn("appendEntries with peer[{}:{}] failed",
peer.getServerAddress().getHost(),
peer.getServerAddress().getPort());
return;
}
if (response.getTerm() > currentTerm) {
LOG.info("Received AppendEntries response from server {} " +
"in term {} (this server's term was {})",
peer.getServerAddress().getServerId(),
response.getTerm(), currentTerm);
stepDown(response.getTerm());
} else {
if (response.getSuccess()) {
peer.setMatchIndex(prevLogIndex + numEntries);
advanceCommitIndex();
peer.setNextIndex(peer.getMatchIndex() + 1);
} else {
if (peer.getNextIndex() > 1) {
peer.setNextIndex(peer.getNextIndex() - 1);
}
if (response.getLastLogIndex() != 0
&& peer.getNextIndex() > response.getLastLogIndex() + 1) {
peer.setNextIndex(response.getLastLogIndex() + 1);
}
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
private void advanceCommitIndex(RaftMessage.AppendEntriesRequest request) {
long newCommitIndex = Math.min(request.getCommitIndex(),
request.getPrevLogIndex() + request.getEntriesCount());
raftNode.setCommitIndex(newCommitIndex);
if (raftNode.getLastAppliedIndex() < raftNode.getCommitIndex()) {
// apply state machine
for (long index = raftNode.getLastAppliedIndex() + 1;
index <= raftNode.getCommitIndex(); index++) {
RaftMessage.LogEntry entry = raftNode.getRaftLog().getEntry(index);
if (entry.getType() == RaftMessage.EntryType.ENTRY_TYPE_DATA) {
raftNode.getStateMachine().apply(entry.getData().toByteArray());
} else if (entry.getType() == RaftMessage.EntryType.ENTRY_TYPE_CONFIGURATION) {
raftNode.applyConfiguration(entry);
}
raftNode.setLastAppliedIndex(index);
}
}
}
#location 10
#vulnerability type NULL_DEREFERENCE
|
#fixed code
private void advanceCommitIndex(RaftMessage.AppendEntriesRequest request) {
long newCommitIndex = Math.min(request.getCommitIndex(),
request.getPrevLogIndex() + request.getEntriesCount());
raftNode.setCommitIndex(newCommitIndex);
if (raftNode.getLastAppliedIndex() < raftNode.getCommitIndex()) {
// apply state machine
for (long index = raftNode.getLastAppliedIndex() + 1;
index <= raftNode.getCommitIndex(); index++) {
RaftMessage.LogEntry entry = raftNode.getRaftLog().getEntry(index);
if (entry != null) {
if (entry.getType() == RaftMessage.EntryType.ENTRY_TYPE_DATA) {
raftNode.getStateMachine().apply(entry.getData().toByteArray());
} else if (entry.getType() == RaftMessage.EntryType.ENTRY_TYPE_CONFIGURATION) {
raftNode.applyConfiguration(entry);
}
}
raftNode.setLastAppliedIndex(index);
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
LOG.info("Receive AppendEntries request from server {} " +
"in term {} (my term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.getLock().lock();
try {
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
raftNode.stepDown(request.getTerm());
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getFirstLogIndex()
&& raftNode.getRaftLog().getEntryTerm(request.getPrevLogIndex())
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getFirstLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntryTerm(index) == entry.getTerm()) {
continue;
}
// truncate segment log from index
long lastIndexKept = index - 1;
raftNode.getRaftLog().truncateSuffix(lastIndexKept);
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// apply state machine
for (index = raftNode.getLastAppliedIndex() + 1; index <= raftNode.getCommitIndex(); index++) {
raftNode.getStateMachine().apply(
raftNode.getRaftLog().getEntry(index).getData().toByteArray());
}
}
return responseBuilder.build();
} finally {
raftNode.getLock().unlock();
}
}
#location 6
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
raftNode.getLock().lock();
try {
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
raftNode.stepDown(request.getTerm());
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getFirstLogIndex()
&& raftNode.getRaftLog().getEntryTerm(request.getPrevLogIndex())
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getFirstLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntryTerm(index) == entry.getTerm()) {
continue;
}
// truncate segment log from index
long lastIndexKept = index - 1;
raftNode.getRaftLog().truncateSuffix(lastIndexKept);
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// apply state machine
for (index = raftNode.getLastAppliedIndex() + 1; index <= raftNode.getCommitIndex(); index++) {
raftNode.getStateMachine().apply(
raftNode.getRaftLog().getEntry(index).getData().toByteArray());
}
}
LOG.info("Receive AppendEntries request from server {} " +
"in term {} (my term is {}), success={}",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm(), responseBuilder.getSuccess());
return responseBuilder.build();
} finally {
raftNode.getLock().unlock();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void installSnapshot(Peer peer) {
Raft.InstallSnapshotRequest.Builder requestBuilder = Raft.InstallSnapshotRequest.newBuilder();
requestBuilder.setServerId(localServer.getServerId());
requestBuilder.setTerm(currentTerm);
// send snapshot
try {
snapshotLock.readLock().lock();
Raft.InstallSnapshotRequest request = this.buildInstallSnapshotRequest(
null, 0, 0);
peer.getRpcClient().asyncCall("RaftConsensusService.installSnapshot",
request, new InstallSnapshotResponseCallback(peer, request));
isSnapshoting = true;
} finally {
snapshotLock.readLock().unlock();
}
}
#location 4
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void installSnapshot(Peer peer) {
Raft.InstallSnapshotRequest.Builder requestBuilder = Raft.InstallSnapshotRequest.newBuilder();
requestBuilder.setServerId(localServer.getServerId());
requestBuilder.setTerm(currentTerm);
// send snapshot
Raft.InstallSnapshotRequest request = this.buildInstallSnapshotRequest(
null, 0, 0);
peer.getRpcClient().asyncCall("RaftConsensusService.installSnapshot",
request, new InstallSnapshotResponseCallback(peer, request));
isSnapshoting = true;
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
responseBuilder.setTerm(request.getTerm());
}
raftNode.stepDown(request.getTerm());
raftNode.resetElectionTimer();
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// TODO: truncate segment log from index
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// TODO: apply state machine
}
return responseBuilder.build();
}
#location 15
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
raftNode.getLock().lock();
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
raftNode.getLock().unlock();
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// truncate segment log from index
long lastIndexKept = index - 1;
raftNode.getRaftLog().truncateSuffix(lastIndexKept);
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// apply state machine
for (index = raftNode.getLastAppliedIndex() + 1; index <= raftNode.getCommitIndex(); index++) {
raftNode.getStateMachine().apply(
raftNode.getRaftLog().getEntry(index).getData().toByteArray());
}
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.InstallSnapshotResponse installSnapshot(Raft.InstallSnapshotRequest request) {
Raft.InstallSnapshotResponse.Builder responseBuilder = Raft.InstallSnapshotResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
raftNode.getLock().lock();
if (request.getTerm() < raftNode.getCurrentTerm()) {
LOG.info("Caller({}) is stale. Our term is {}, theirs is {}",
request.getServerId(), raftNode.getCurrentTerm(), request.getTerm());
raftNode.getLock().unlock();
return responseBuilder.build();
}
raftNode.stepDown(request.getTerm());
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
raftNode.getLock().unlock();
// write snapshot data to local
String tmpSnapshotDir = raftNode.getSnapshot().getSnapshotDir() + ".tmp";
File file = new File(tmpSnapshotDir);
if (file.exists() && request.getIsFirst()) {
file.delete();
file.mkdir();
}
if (request.getIsFirst()) {
raftNode.getSnapshot().updateMetaData(tmpSnapshotDir,
request.getSnapshotMetaData().getLastIncludedIndex(),
request.getSnapshotMetaData().getLastIncludedTerm());
}
// write to file
RandomAccessFile randomAccessFile = null;
try {
String currentDataFileName = tmpSnapshotDir + File.pathSeparator
+ "data" + File.pathSeparator + request.getFileName();
File currentDataFile = new File(currentDataFileName);
if (!currentDataFile.exists()) {
currentDataFile.createNewFile();
}
randomAccessFile = RaftFileUtils.openFile(
tmpSnapshotDir + File.pathSeparator + "data",
request.getFileName(), "rw");
randomAccessFile.skipBytes((int) request.getOffset());
randomAccessFile.write(request.getData().toByteArray());
if (randomAccessFile != null) {
try {
randomAccessFile.close();
randomAccessFile = null;
} catch (Exception ex2) {
LOG.warn("close failed");
}
}
// move tmp dir to snapshot dir if this is the last package
File snapshotDirFile = new File(raftNode.getSnapshot().getSnapshotDir());
if (snapshotDirFile.exists()) {
snapshotDirFile.delete();
}
FileUtils.moveDirectory(new File(tmpSnapshotDir), snapshotDirFile);
responseBuilder.setSuccess(true);
} catch (IOException ex) {
LOG.warn("io exception, msg={}", ex.getMessage());
} finally {
RaftFileUtils.closeFile(randomAccessFile);
}
return responseBuilder.build();
}
#location 27
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.InstallSnapshotResponse installSnapshot(Raft.InstallSnapshotRequest request) {
raftNode.getLock().lock();
Raft.InstallSnapshotResponse.Builder responseBuilder = Raft.InstallSnapshotResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
LOG.info("Caller({}) is stale. Our term is {}, theirs is {}",
request.getServerId(), raftNode.getCurrentTerm(), request.getTerm());
raftNode.getLock().unlock();
return responseBuilder.build();
}
raftNode.stepDown(request.getTerm());
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
// write snapshot data to local
String tmpSnapshotDir = raftNode.getSnapshot().getSnapshotDir() + ".tmp";
File file = new File(tmpSnapshotDir);
if (file.exists() && request.getIsFirst()) {
file.delete();
file.mkdir();
}
if (request.getIsFirst()) {
raftNode.getSnapshot().updateMetaData(tmpSnapshotDir,
request.getSnapshotMetaData().getLastIncludedIndex(),
request.getSnapshotMetaData().getLastIncludedTerm());
}
// write to file
RandomAccessFile randomAccessFile = null;
try {
String currentDataFileName = tmpSnapshotDir + File.pathSeparator
+ "data" + File.pathSeparator + request.getFileName();
File currentDataFile = new File(currentDataFileName);
if (!currentDataFile.exists()) {
currentDataFile.createNewFile();
}
randomAccessFile = RaftFileUtils.openFile(
tmpSnapshotDir + File.pathSeparator + "data",
request.getFileName(), "rw");
randomAccessFile.skipBytes((int) request.getOffset());
randomAccessFile.write(request.getData().toByteArray());
if (randomAccessFile != null) {
try {
randomAccessFile.close();
randomAccessFile = null;
} catch (Exception ex2) {
LOG.warn("close failed");
}
}
// move tmp dir to snapshot dir if this is the last package
File snapshotDirFile = new File(raftNode.getSnapshot().getSnapshotDir());
if (snapshotDirFile.exists()) {
snapshotDirFile.delete();
}
FileUtils.moveDirectory(new File(tmpSnapshotDir), snapshotDirFile);
responseBuilder.setSuccess(true);
} catch (IOException ex) {
LOG.warn("io exception, msg={}", ex.getMessage());
} finally {
RaftFileUtils.closeFile(randomAccessFile);
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void advanceCommitIndex() {
// 获取quorum matchIndex
int peerNum = peers.size();
long[] matchIndexes = new long[peerNum + 1];
for (int i = 0; i < peerNum - 1; i++) {
matchIndexes[i] = peers.get(i).getMatchIndex();
}
matchIndexes[peerNum] = lastSyncedIndex;
Arrays.sort(matchIndexes);
long newCommitIndex = matchIndexes[(peerNum + 1 + 1) / 2];
if (raftLog.getEntry(newCommitIndex).getTerm() != currentTerm) {
return;
}
lock.lock();
if (commitIndex >= newCommitIndex) {
return;
}
long oldCommitIndex = commitIndex;
commitIndex = newCommitIndex;
// 同步到状态机
for (long index = oldCommitIndex + 1; index <= newCommitIndex; index++) {
Raft.LogEntry entry = raftLog.getEntry(index);
stateMachine.apply(entry.getData().toByteArray());
}
lastAppliedIndex = commitIndex;
commitIndexCondition.signalAll();
lock.unlock();
}
#location 15
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void advanceCommitIndex() {
// 获取quorum matchIndex
int peerNum = peers.size();
long[] matchIndexes = new long[peerNum + 1];
for (int i = 0; i < peerNum - 1; i++) {
matchIndexes[i] = peers.get(i).getMatchIndex();
}
matchIndexes[peerNum] = raftLog.getLastLogIndex();
Arrays.sort(matchIndexes);
long newCommitIndex = matchIndexes[(peerNum + 1 + 1) / 2];
if (raftLog.getEntry(newCommitIndex).getTerm() != currentTerm) {
return;
}
lock.lock();
if (commitIndex >= newCommitIndex) {
return;
}
long oldCommitIndex = commitIndex;
commitIndex = newCommitIndex;
// 同步到状态机
for (long index = oldCommitIndex + 1; index <= newCommitIndex; index++) {
Raft.LogEntry entry = raftLog.getEntry(index);
stateMachine.apply(entry.getData().toByteArray());
}
lastAppliedIndex = commitIndex;
commitIndexCondition.signalAll();
lock.unlock();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void takeSnapshot() {
if (raftLog.getTotalSize() < RaftOption.snapshotMinLogSize) {
return;
}
if (lastAppliedIndex <= lastSnapshotIndex) {
return;
}
long lastAppliedTerm = 0;
if (lastAppliedIndex >= raftLog.getStartLogIndex()
&& lastAppliedIndex <= raftLog.getLastLogIndex()) {
lastAppliedTerm = raftLog.getEntry(lastAppliedIndex).getTerm();
}
snapshotLock.writeLock().lock();
// take snapshot
String tmpSnapshotDir = snapshot.getSnapshotDir() + ".tmp";
snapshot.updateMetaData(tmpSnapshotDir, lastAppliedIndex, lastAppliedTerm);
String tmpSnapshotDataDir = tmpSnapshotDir + File.pathSeparator + "data";
stateMachine.writeSnapshot(tmpSnapshotDataDir);
try {
FileUtils.moveDirectory(new File(tmpSnapshotDir), new File(snapshot.getSnapshotDir()));
lastSnapshotIndex = lastAppliedIndex;
lastSnapshotTerm = lastAppliedTerm;
} catch (IOException ex) {
LOG.warn("move direct failed, msg={}", ex.getMessage());
}
snapshotLock.writeLock().unlock();
}
#location 5
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void takeSnapshot() {
if (raftLog.getTotalSize() < RaftOption.snapshotMinLogSize) {
return;
}
if (lastAppliedIndex <= snapshot.getMetaData().getLastIncludedIndex()) {
return;
}
long lastAppliedTerm = 0;
if (lastAppliedIndex >= raftLog.getFirstLogIndex()
&& lastAppliedIndex <= raftLog.getLastLogIndex()) {
lastAppliedTerm = raftLog.getEntry(lastAppliedIndex).getTerm();
}
if (!isSnapshoting) {
isSnapshoting = true;
// take snapshot
String tmpSnapshotDir = snapshot.getSnapshotDir() + ".tmp";
snapshot.updateMetaData(tmpSnapshotDir, lastAppliedIndex, lastAppliedTerm);
String tmpSnapshotDataDir = tmpSnapshotDir + File.pathSeparator + "data";
stateMachine.writeSnapshot(tmpSnapshotDataDir);
try {
FileUtils.moveDirectory(new File(tmpSnapshotDir), new File(snapshot.getSnapshotDir()));
} catch (IOException ex) {
LOG.warn("move direct failed, msg={}", ex.getMessage());
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
responseBuilder.setTerm(request.getTerm());
}
raftNode.stepDown(request.getTerm());
raftNode.resetElectionTimer();
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// TODO: truncate segment log from index
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// TODO: apply state machine
}
return responseBuilder.build();
}
#location 19
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
raftNode.getLock().lock();
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
raftNode.getLock().unlock();
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// truncate segment log from index
long lastIndexKept = index - 1;
raftNode.getRaftLog().truncateSuffix(lastIndexKept);
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// apply state machine
for (index = raftNode.getLastAppliedIndex() + 1; index <= raftNode.getCommitIndex(); index++) {
raftNode.getStateMachine().apply(
raftNode.getRaftLog().getEntry(index).getData().toByteArray());
}
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (request.getTerm() == raftNode.getCurrentTerm()) {
if ((raftNode.getVotedFor() == 0
|| raftNode.getVotedFor() == request.getServerId())
&& (raftNode.getCurrentTerm() == request.getTerm()
&& raftNode.getCommitIndex() == request.getLastLogIndex())) {
raftNode.setVotedFor(request.getServerId());
raftNode.stepDown(raftNode.getCurrentTerm());
raftNode.resetElectionTimer();
raftNode.updateMetaData();
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(true)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
}
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(false)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
#location 18
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
raftNode.getLock().lock();
Raft.VoteResponse.Builder responseBuilder = Raft.VoteResponse.newBuilder();
responseBuilder.setGranted(false);
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
boolean logIsOk = request.getLastLogTerm() > raftNode.getRaftLog().getLastLogTerm()
|| (request.getLastLogTerm() == raftNode.getRaftLog().getLastLogTerm()
&& request.getLastLogIndex() >= raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getVotedFor() == 0 || logIsOk) {
raftNode.stepDown(request.getTerm());
raftNode.setVotedFor(request.getServerId());
raftNode.updateMetaData();
responseBuilder.setGranted(true);
responseBuilder.setTerm(raftNode.getCurrentTerm());
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.InstallSnapshotResponse installSnapshot(Raft.InstallSnapshotRequest request) {
Raft.InstallSnapshotResponse.Builder responseBuilder = Raft.InstallSnapshotResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
raftNode.getLock().lock();
if (request.getTerm() < raftNode.getCurrentTerm()) {
LOG.info("Caller({}) is stale. Our term is {}, theirs is {}",
request.getServerId(), raftNode.getCurrentTerm(), request.getTerm());
raftNode.getLock().unlock();
return responseBuilder.build();
}
raftNode.stepDown(request.getTerm());
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
raftNode.getLock().unlock();
// write snapshot data to local
String tmpSnapshotDir = raftNode.getSnapshot().getSnapshotDir() + ".tmp";
File file = new File(tmpSnapshotDir);
if (file.exists() && request.getIsFirst()) {
file.delete();
file.mkdir();
}
if (request.getIsFirst()) {
raftNode.getSnapshot().updateMetaData(tmpSnapshotDir,
request.getSnapshotMetaData().getLastIncludedIndex(),
request.getSnapshotMetaData().getLastIncludedTerm());
}
// write to file
RandomAccessFile randomAccessFile = null;
try {
String currentDataFileName = tmpSnapshotDir + File.pathSeparator
+ "data" + File.pathSeparator + request.getFileName();
File currentDataFile = new File(currentDataFileName);
if (!currentDataFile.exists()) {
currentDataFile.createNewFile();
}
randomAccessFile = RaftFileUtils.openFile(
tmpSnapshotDir + File.pathSeparator + "data",
request.getFileName(), "rw");
randomAccessFile.skipBytes((int) request.getOffset());
randomAccessFile.write(request.getData().toByteArray());
if (randomAccessFile != null) {
try {
randomAccessFile.close();
randomAccessFile = null;
} catch (Exception ex2) {
LOG.warn("close failed");
}
}
// move tmp dir to snapshot dir if this is the last package
File snapshotDirFile = new File(raftNode.getSnapshot().getSnapshotDir());
if (snapshotDirFile.exists()) {
snapshotDirFile.delete();
}
FileUtils.moveDirectory(new File(tmpSnapshotDir), snapshotDirFile);
responseBuilder.setSuccess(true);
} catch (IOException ex) {
LOG.warn("io exception, msg={}", ex.getMessage());
} finally {
RaftFileUtils.closeFile(randomAccessFile);
}
return responseBuilder.build();
}
#location 4
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.InstallSnapshotResponse installSnapshot(Raft.InstallSnapshotRequest request) {
raftNode.getLock().lock();
Raft.InstallSnapshotResponse.Builder responseBuilder = Raft.InstallSnapshotResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
LOG.info("Caller({}) is stale. Our term is {}, theirs is {}",
request.getServerId(), raftNode.getCurrentTerm(), request.getTerm());
raftNode.getLock().unlock();
return responseBuilder.build();
}
raftNode.stepDown(request.getTerm());
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
// write snapshot data to local
String tmpSnapshotDir = raftNode.getSnapshot().getSnapshotDir() + ".tmp";
File file = new File(tmpSnapshotDir);
if (file.exists() && request.getIsFirst()) {
file.delete();
file.mkdir();
}
if (request.getIsFirst()) {
raftNode.getSnapshot().updateMetaData(tmpSnapshotDir,
request.getSnapshotMetaData().getLastIncludedIndex(),
request.getSnapshotMetaData().getLastIncludedTerm());
}
// write to file
RandomAccessFile randomAccessFile = null;
try {
String currentDataFileName = tmpSnapshotDir + File.pathSeparator
+ "data" + File.pathSeparator + request.getFileName();
File currentDataFile = new File(currentDataFileName);
if (!currentDataFile.exists()) {
currentDataFile.createNewFile();
}
randomAccessFile = RaftFileUtils.openFile(
tmpSnapshotDir + File.pathSeparator + "data",
request.getFileName(), "rw");
randomAccessFile.skipBytes((int) request.getOffset());
randomAccessFile.write(request.getData().toByteArray());
if (randomAccessFile != null) {
try {
randomAccessFile.close();
randomAccessFile = null;
} catch (Exception ex2) {
LOG.warn("close failed");
}
}
// move tmp dir to snapshot dir if this is the last package
File snapshotDirFile = new File(raftNode.getSnapshot().getSnapshotDir());
if (snapshotDirFile.exists()) {
snapshotDirFile.delete();
}
FileUtils.moveDirectory(new File(tmpSnapshotDir), snapshotDirFile);
responseBuilder.setSuccess(true);
} catch (IOException ex) {
LOG.warn("io exception, msg={}", ex.getMessage());
} finally {
RaftFileUtils.closeFile(randomAccessFile);
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void installSnapshot(Peer peer) {
Raft.InstallSnapshotRequest.Builder requestBuilder = Raft.InstallSnapshotRequest.newBuilder();
requestBuilder.setServerId(localServer.getServerId());
requestBuilder.setTerm(currentTerm);
// send snapshot
try {
snapshotLock.readLock().lock();
Raft.InstallSnapshotRequest request = this.buildInstallSnapshotRequest(
null, 0, 0);
peer.getRpcClient().asyncCall("RaftConsensusService.installSnapshot",
request, new InstallSnapshotResponseCallback(peer, request));
isSnapshoting = true;
} finally {
snapshotLock.readLock().unlock();
}
}
#location 3
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void installSnapshot(Peer peer) {
Raft.InstallSnapshotRequest.Builder requestBuilder = Raft.InstallSnapshotRequest.newBuilder();
requestBuilder.setServerId(localServer.getServerId());
requestBuilder.setTerm(currentTerm);
// send snapshot
Raft.InstallSnapshotRequest request = this.buildInstallSnapshotRequest(
null, 0, 0);
peer.getRpcClient().asyncCall("RaftConsensusService.installSnapshot",
request, new InstallSnapshotResponseCallback(peer, request));
isSnapshoting = true;
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
responseBuilder.setTerm(request.getTerm());
}
raftNode.stepDown(request.getTerm());
raftNode.resetElectionTimer();
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// TODO: truncate segment log from index
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// TODO: apply state machine
}
return responseBuilder.build();
}
#location 18
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.AppendEntriesResponse appendEntries(Raft.AppendEntriesRequest request) {
raftNode.getLock().lock();
Raft.AppendEntriesResponse.Builder responseBuilder = Raft.AppendEntriesResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
responseBuilder.setSuccess(false);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received AppendEntries request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
if (request.getPrevLogIndex() > raftNode.getRaftLog().getLastLogIndex()) {
LOG.debug("Rejecting AppendEntries RPC: would leave gap");
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getPrevLogIndex() >= raftNode.getRaftLog().getStartLogIndex()
&& raftNode.getRaftLog().getEntry(request.getPrevLogIndex()).getTerm()
!= request.getPrevLogTerm()) {
LOG.debug("Rejecting AppendEntries RPC: terms don't agree");
raftNode.getLock().unlock();
return responseBuilder.build();
}
responseBuilder.setSuccess(true);
List<Raft.LogEntry> entries = new ArrayList<>();
long index = request.getPrevLogIndex();
for (Raft.LogEntry entry : request.getEntriesList()) {
index++;
if (index < raftNode.getRaftLog().getStartLogIndex()) {
continue;
}
if (raftNode.getRaftLog().getLastLogIndex() >= index) {
if (raftNode.getRaftLog().getEntry(index).getTerm() == entry.getTerm()) {
continue;
}
// truncate segment log from index
long lastIndexKept = index - 1;
raftNode.getRaftLog().truncateSuffix(lastIndexKept);
}
entries.add(entry);
}
raftNode.getRaftLog().append(entries);
responseBuilder.setLastLogIndex(raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getCommitIndex() < request.getCommitIndex()) {
raftNode.setCommitIndex(request.getCommitIndex());
// apply state machine
for (index = raftNode.getLastAppliedIndex() + 1; index <= raftNode.getCommitIndex(); index++) {
raftNode.getStateMachine().apply(
raftNode.getRaftLog().getEntry(index).getData().toByteArray());
}
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void replicate(byte[] data) {
Raft.LogEntry logEntry = Raft.LogEntry.newBuilder()
.setTerm(currentTerm)
.setType(Raft.EntryType.ENTRY_TYPE_DATA)
.setData(ByteString.copyFrom(data)).build();
List<Raft.LogEntry> entries = new ArrayList<>();
entries.add(logEntry);
long newLastLogIndex = raftLog.append(entries);
for (final Peer peer : peers) {
executorService.submit(new Runnable() {
@Override
public void run() {
appendEntries(peer);
}
});
}
// sync wait condition commitIndex >= newLastLogIndex
// TODO: add timeout
lock.lock();
try {
while (commitIndex < newLastLogIndex) {
try {
commitIndexCondition.await();
} catch (InterruptedException ex) {
LOG.warn(ex.getMessage());
}
}
} finally {
lock.unlock();
}
}
#location 8
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void replicate(byte[] data) {
lock.lock();
Raft.LogEntry logEntry = Raft.LogEntry.newBuilder()
.setTerm(currentTerm)
.setType(Raft.EntryType.ENTRY_TYPE_DATA)
.setData(ByteString.copyFrom(data)).build();
List<Raft.LogEntry> entries = new ArrayList<>();
entries.add(logEntry);
long newLastLogIndex = raftLog.append(entries);
for (final Peer peer : peers) {
executorService.submit(new Runnable() {
@Override
public void run() {
appendEntries(peer);
}
});
}
// sync wait condition commitIndex >= newLastLogIndex
// TODO: add timeout
try {
while (commitIndex < newLastLogIndex) {
try {
commitIndexCondition.await();
} catch (InterruptedException ex) {
LOG.warn(ex.getMessage());
}
}
} finally {
lock.unlock();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.InstallSnapshotResponse installSnapshot(Raft.InstallSnapshotRequest request) {
LOG.info("Receive installSnapshot request from server {} " +
"in term {} (my term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.getLock().lock();
try {
Raft.InstallSnapshotResponse.Builder responseBuilder = Raft.InstallSnapshotResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
raftNode.stepDown(request.getTerm());
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
// write snapshot data to local
String tmpSnapshotDir = raftNode.getSnapshot().getSnapshotDir() + ".tmp";
File file = new File(tmpSnapshotDir);
if (file.exists() && request.getIsFirst()) {
file.delete();
file.mkdir();
}
if (request.getIsFirst()) {
raftNode.getSnapshot().updateMetaData(tmpSnapshotDir,
request.getSnapshotMetaData().getLastIncludedIndex(),
request.getSnapshotMetaData().getLastIncludedTerm());
}
// write to file
RandomAccessFile randomAccessFile = null;
try {
String currentDataFileName = tmpSnapshotDir + File.separator
+ "data" + File.separator + request.getFileName();
File currentDataFile = new File(currentDataFileName);
if (!currentDataFile.exists()) {
currentDataFile.createNewFile();
}
randomAccessFile = RaftFileUtils.openFile(
tmpSnapshotDir + File.separator + "data",
request.getFileName(), "rw");
randomAccessFile.skipBytes((int) request.getOffset());
randomAccessFile.write(request.getData().toByteArray());
if (randomAccessFile != null) {
try {
randomAccessFile.close();
randomAccessFile = null;
} catch (Exception ex2) {
LOG.warn("close failed");
}
}
// move tmp dir to snapshot dir if this is the last package
File snapshotDirFile = new File(raftNode.getSnapshot().getSnapshotDir());
if (snapshotDirFile.exists()) {
snapshotDirFile.delete();
}
FileUtils.moveDirectory(new File(tmpSnapshotDir), snapshotDirFile);
responseBuilder.setSuccess(true);
} catch (IOException ex) {
LOG.warn("io exception, msg={}", ex.getMessage());
} finally {
RaftFileUtils.closeFile(randomAccessFile);
}
return responseBuilder.build();
} finally {
raftNode.getLock().unlock();
}
}
#location 6
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.InstallSnapshotResponse installSnapshot(Raft.InstallSnapshotRequest request) {
raftNode.getLock().lock();
try {
Raft.InstallSnapshotResponse.Builder responseBuilder = Raft.InstallSnapshotResponse.newBuilder();
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
return responseBuilder.build();
}
raftNode.stepDown(request.getTerm());
if (raftNode.getLeaderId() == 0) {
raftNode.setLeaderId(request.getServerId());
}
// write snapshot data to local
String tmpSnapshotDir = raftNode.getSnapshot().getSnapshotDir() + ".tmp";
File file = new File(tmpSnapshotDir);
if (file.exists() && request.getIsFirst()) {
file.delete();
file.mkdir();
}
if (request.getIsFirst()) {
raftNode.getSnapshot().updateMetaData(tmpSnapshotDir,
request.getSnapshotMetaData().getLastIncludedIndex(),
request.getSnapshotMetaData().getLastIncludedTerm());
}
// write to file
RandomAccessFile randomAccessFile = null;
try {
String currentDataFileName = tmpSnapshotDir + File.separator
+ "data" + File.separator + request.getFileName();
File currentDataFile = new File(currentDataFileName);
if (!currentDataFile.exists()) {
currentDataFile.createNewFile();
}
randomAccessFile = RaftFileUtils.openFile(
tmpSnapshotDir + File.separator + "data",
request.getFileName(), "rw");
randomAccessFile.skipBytes((int) request.getOffset());
randomAccessFile.write(request.getData().toByteArray());
if (randomAccessFile != null) {
try {
randomAccessFile.close();
randomAccessFile = null;
} catch (Exception ex2) {
LOG.warn("close failed");
}
}
// move tmp dir to snapshot dir if this is the last package
File snapshotDirFile = new File(raftNode.getSnapshot().getSnapshotDir());
if (snapshotDirFile.exists()) {
snapshotDirFile.delete();
}
FileUtils.moveDirectory(new File(tmpSnapshotDir), snapshotDirFile);
responseBuilder.setSuccess(true);
} catch (IOException ex) {
LOG.warn("io exception, msg={}", ex.getMessage());
} finally {
RaftFileUtils.closeFile(randomAccessFile);
}
LOG.info("Receive installSnapshot request from server {} " +
"in term {} (my term is {}), success={}",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm(), responseBuilder.getSuccess());
return responseBuilder.build();
} finally {
raftNode.getLock().unlock();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
if (request.getTerm() == raftNode.getCurrentTerm()) {
if ((raftNode.getVotedFor() == 0
|| raftNode.getVotedFor() == request.getServerId())
&& (raftNode.getCurrentTerm() == request.getTerm()
&& raftNode.getCommitIndex() == request.getLastLogIndex())) {
raftNode.setVotedFor(request.getServerId());
raftNode.stepDown(raftNode.getCurrentTerm());
raftNode.resetElectionTimer();
raftNode.updateMetaData();
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(true)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
}
Raft.VoteResponse response = Raft.VoteResponse.newBuilder()
.setGranted(false)
.setTerm(raftNode.getCurrentTerm()).build();
return response;
}
#location 12
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
@Override
public Raft.VoteResponse requestVote(Raft.VoteRequest request) {
raftNode.getLock().lock();
Raft.VoteResponse.Builder responseBuilder = Raft.VoteResponse.newBuilder();
responseBuilder.setGranted(false);
responseBuilder.setTerm(raftNode.getCurrentTerm());
if (request.getTerm() < raftNode.getCurrentTerm()) {
raftNode.getLock().unlock();
return responseBuilder.build();
}
if (request.getTerm() > raftNode.getCurrentTerm()) {
LOG.info("Received RequestVote request from server {} " +
"in term {} (this server's term was {})",
request.getServerId(), request.getTerm(),
raftNode.getCurrentTerm());
raftNode.stepDown(request.getTerm());
}
boolean logIsOk = request.getLastLogTerm() > raftNode.getRaftLog().getLastLogTerm()
|| (request.getLastLogTerm() == raftNode.getRaftLog().getLastLogTerm()
&& request.getLastLogIndex() >= raftNode.getRaftLog().getLastLogIndex());
if (raftNode.getVotedFor() == 0 || logIsOk) {
raftNode.stepDown(request.getTerm());
raftNode.setVotedFor(request.getServerId());
raftNode.updateMetaData();
responseBuilder.setGranted(true);
responseBuilder.setTerm(raftNode.getCurrentTerm());
}
raftNode.getLock().unlock();
return responseBuilder.build();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public static void main(String[] args) {
String pipelinePath = new ZhihuConfiguration().getFolloweePath();
int crawlSize = 1000000;
Spider.create(new ZhihuFolloweePageProcessor())
.setScheduler(//new QueueScheduler()
new FixedFileCacheQueueScheduler(pipelinePath)
.setDuplicateRemover(new BloomFilterDuplicateRemover(crawlSize)))
.addPipeline(new FilePipeline(pipelinePath))
.addUrl(generateMemberUrl("hydro-ding"))
.thread(20)
.run();
}
#location 7
#vulnerability type RESOURCE_LEAK
|
#fixed code
public static void main(String[] args) {
String pipelinePath = new ZhihuConfiguration().getFolloweePath();
int crawlSize = 1000000;
Spider.create(new ZhihuFolloweePageProcessor())
.setScheduler(//new QueueScheduler()
new FileCacheQueueScheduler(pipelinePath)
.setDuplicateRemover(new BloomFilterDuplicateRemover(crawlSize)))
.addPipeline(new FilePipeline(pipelinePath))
.addUrl(generateMemberUrl("hydro-ding"))
.thread(20)
.run();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public Set<String> getURLTokens(String path) {
Set<String> urlTokens = new HashSet<>();
BufferedReader in;
try {
in = new BufferedReader(
new FileReader(new File(path))
);
String s;
while ((s = in.readLine()) != null) {
urlTokens.add(s);
}
in.close();
return urlTokens;
} catch (IOException e) {
logger.error("IOException when readFollowees user data from file : {}", e);
return null;
}
}
#location 16
#vulnerability type RESOURCE_LEAK
|
#fixed code
public Set<String> getURLTokens(String path) {
List<String> tokens = FileHelper.processFile(path, br -> {
List<String> ts = new ArrayList<>();
String s;
while ((s = br.readLine()) != null) {
ts.add(s);
}
return ts;
}).orElse(new ArrayList<>());
return new HashSet<>(tokens);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public static void main(String[] args) {
TransportClient client = null;
try {
// on startup
client = new PreBuiltTransportClient(Settings.EMPTY)
.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName("host1"), 9300))
.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName("host2"), 9300));
// on shutdown
client.close();
} catch (UnknownHostException e) {
e.printStackTrace();
}
}
#location 6
#vulnerability type RESOURCE_LEAK
|
#fixed code
public static void main(String[] args) {
ElasticsearchUploader esUploader = new ElasticsearchUploader();
ElasticsearchUploader.logger.info("aaa");
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public static String readFollowees(File inItem) {
BufferedReader in = null;
try {
in = new BufferedReader(
new FileReader(inItem)
);
String s;
in.readLine();//pass first line
s = in.readLine();
if (!StringUtils.isEmpty(s)) {
s = s.substring(s.indexOf("{"));
}
in.close();
return s;
} catch (IOException e) {
logger.error("IOException when readFollowees user data from file : {}", e);
return null;
}
}
#location 15
#vulnerability type RESOURCE_LEAK
|
#fixed code
public static String readFollowees(File inItem) {
List<String> followees = FileHelper.processFile(inItem, br -> {
br.readLine();//pass first line
String s = br.readLine();
if (!StringUtils.isEmpty(s)) {
s = s.substring(s.indexOf("{"));
}
return Collections.singletonList(s);
}).orElse(new ArrayList<>());
return followees.size() == 0 ? null : followees.get(0);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public static List<String> readFileAsLines(File inItem) {
BufferedReader in = null;
List<String> lines = new ArrayList<>();
try {
in = new BufferedReader(
new FileReader(inItem)
);
String s = in.readLine();
while (s != null) {
lines.add(s);
s = in.readLine();
}
in.close();
return lines;
} catch (IOException e) {
logger.error("IOException when read data from file : {}", e);
return null;
}
}
#location 15
#vulnerability type RESOURCE_LEAK
|
#fixed code
public static List<String> readFileAsLines(File inItem) {
String path = inItem.getPath();
return readFileAsLines(path);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public static void main(String[] args) {
String pipelinePath = "/Users/brian/todo/data/webmagic";
String tokenPath = "/Users/brian/todo/data/backup/url_tokens/users.txt";
ZhihuMemberUrlTokenGetter getter = new ZhihuMemberUrlTokenGetter();
Spider spider = Spider.create(new ZhihuMemberPageProcessor())
.setScheduler(new FixedFileCacheQueueScheduler(pipelinePath))
.addPipeline(new ZhihuMemberPipeline(pipelinePath))
.thread(20);
for (String token : getter.getUrlTokens(tokenPath)) {
spider.addUrl(generateMemberUrl(token));
}
spider.run();
}
#location 11
#vulnerability type NULL_DEREFERENCE
|
#fixed code
public static void main(String[] args) {
ZhihuConfiguration configuration = new ZhihuConfiguration();
String pipelinePath = configuration.getMemberPath();
Spider spider = Spider.create(new ZhihuMemberPageProcessor())
.setScheduler(new FixedFileCacheQueueScheduler(pipelinePath))
.addPipeline(new ZhihuMemberPipeline(pipelinePath))
.thread(20);
ZhihuMemberUrlTokenGetter getter = new ZhihuMemberUrlTokenGetter();
for (String token : getter.getUrlTokens()) {
spider.addUrl(generateMemberUrl(token));
}
spider.run();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@BeforeClass
public void setup() {
ExtentHtmlReporter htmlReporter = new ExtentHtmlReporter(htmlFilePath);
ExtentXReporter extentx = new ExtentXReporter("localhost");
extentx.config().setProjectName("extentreports");
extentx.config().setReportName(fileName);
extentx.config().setServerUrl("http://localhost:1337/");
extent = new ExtentReports();
extent.attachReporter(htmlReporter);
}
#location 8
#vulnerability type RESOURCE_LEAK
|
#fixed code
@BeforeClass
public void setup() {
ExtentHtmlReporter htmlReporter = new ExtentHtmlReporter(htmlFilePath);
extent = new ExtentReports();
extent.attachReporter(htmlReporter);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void loadConfig(String filePath) {
Properties properties = new Properties();
try {
InputStream is = new FileInputStream(filePath);
properties.load(is);
loadConfig(properties);
} catch (FileNotFoundException e) {
logger.log(Level.SEVERE, "Default Properties file not found", e);
} catch (IOException e) {
logger.log(Level.SEVERE, "Unable to load properties file", e);
}
}
#location 6
#vulnerability type RESOURCE_LEAK
|
#fixed code
public void loadConfig(String filePath) {
try {
InputStream is = new FileInputStream(filePath);
loadConfig(is);
} catch (FileNotFoundException e) {
logger.log(Level.SEVERE, "Default Properties file not found", e);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@BeforeClass
public void beforeClass() {
ExtentManager.createInstance(filePath);
ExtentXReporter extentx = new ExtentXReporter("localhost");
extentx.config().setProjectName("extentreports-pro");
extentx.config().setReportName(fileName);
extentx.config().setServerUrl("http://localhost:1337/");
ExtentManager.getInstance().attachReporter(extentx);
ExtentTestManager.setReporter(ExtentManager.getInstance());;
}
#location 10
#vulnerability type RESOURCE_LEAK
|
#fixed code
@BeforeClass
public void beforeClass() {
ExtentManager.createInstance(filePath);
ExtentTestManager.setReporter(ExtentManager.getInstance());
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Override
public void onScreenCaptureAdded(Test test, ScreenCapture screenCapture) throws IOException {
storeUrl();
screenCapture.setReportObjectId(reportId);
createMedia(test, screenCapture);
if (media == null) {
media = new MediaStorageManagerFactory().getManager("http");
media.init(url);
}
media.storeMedia(screenCapture);
}
#location 10
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Override
public void onScreenCaptureAdded(Test test, ScreenCapture screenCapture) throws IOException {
storeUrl();
screenCapture.setReportObjectId(reportId);
createMedia(test, screenCapture);
initMedia();
media.storeMedia(screenCapture);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testGetAzureTokenCredentials() throws Exception {
// 1. use azure-secret.json
File testConfigDir = new File(this.getClass().getResource("/azure-login/azure-secret.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
AzureTokenCredentials cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
// 2. use azure cli(non SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/default/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials cliCred = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cliCred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", cliCred.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cliCred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 3. use azure cli(SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/sp/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials azureCliCredential = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", azureCliCredential.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 4. use cloud shell
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, "azure");
assertTrue(AzureAuthHelper.isInCloudShell());
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, "non-exist-folder");
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof MSICredentials);
// 5. all of the ways have been tried
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, null);
assertNull(AzureAuthHelper.getAzureTokenCredentials(null));
}
#location 8
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Test
public void testGetAzureTokenCredentials() throws Exception {
// 1. use azure-secret.json
File testConfigDir = new File(this.getClass().getResource("/azure-login/azure-secret.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
AzureTokenCredentials cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
// 2. use azure cli(non SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/default/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null).getAzureTokenCredentials();
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials cliCred = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cliCred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", cliCred.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cliCred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 3. use azure cli(SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/sp/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null).getAzureTokenCredentials();
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials azureCliCredential = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", azureCliCredential.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 4. use cloud shell
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, "azure");
assertTrue(AzureAuthHelper.isInCloudShell());
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, "non-exist-folder");
cred = AzureAuthHelper.getAzureTokenCredentials(null).getAzureTokenCredentials();
assertNotNull(cred);
assertTrue(cred instanceof MSICredentials);
// 5. all of the ways have been tried
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, null);
assertNull(AzureAuthHelper.getAzureTokenCredentials(null));
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
protected boolean isInstallingExtensionNeeded(Set<BindingEnum> bindingTypes) {
final JsonObject hostJson = readHostJson();
final JsonObject extensionBundle = hostJson.getAsJsonObject(EXTENSION_BUNDLE);
if (extensionBundle != null && extensionBundle.has("id") &&
StringUtils.equalsIgnoreCase(extensionBundle.get("id").getAsString(), EXTENSION_BUNDLE_ID)) {
getLog().info(SKIP_INSTALL_EXTENSIONS_BUNDLE);
return false;
}
final boolean isNonHttpTriggersExist = bindingTypes.stream().anyMatch(binding ->
!Arrays.asList(FUNCTION_WITHOUT_FUNCTION_EXTENSION).contains(binding));
if (!isNonHttpTriggersExist) {
getLog().info(SKIP_INSTALL_EXTENSIONS_HTTP);
return false;
}
return true;
}
#location 3
#vulnerability type NULL_DEREFERENCE
|
#fixed code
protected boolean isInstallingExtensionNeeded(Set<BindingEnum> bindingTypes) {
final JsonObject hostJson = readHostJson();
final JsonObject extensionBundle = hostJson == null ? null : hostJson.getAsJsonObject(EXTENSION_BUNDLE);
if (extensionBundle != null && extensionBundle.has("id") &&
StringUtils.equalsIgnoreCase(extensionBundle.get("id").getAsString(), EXTENSION_BUNDLE_ID)) {
getLog().info(SKIP_INSTALL_EXTENSIONS_BUNDLE);
return false;
}
final boolean isNonHttpTriggersExist = bindingTypes.stream().anyMatch(binding ->
!Arrays.asList(FUNCTION_WITHOUT_FUNCTION_EXTENSION).contains(binding));
if (!isNonHttpTriggersExist) {
getLog().info(SKIP_INSTALL_EXTENSIONS_HTTP);
return false;
}
return true;
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testGetAzureTokenCredentials() throws Exception {
// 1. use azure-secret.json
File testConfigDir = new File(this.getClass().getResource("/azure-login/azure-secret.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
AzureTokenCredentials cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
// 2. use azure cli(non SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/default/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials cliCred = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cliCred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", cliCred.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cliCred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 3. use azure cli(SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/sp/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials azureCliCredential = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", azureCliCredential.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 4. use cloud shell
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, "azure");
assertTrue(AzureAuthHelper.isInCloudShell());
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, "non-exist-folder");
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof MSICredentials);
// 5. all of the ways have been tried
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, null);
assertNull(AzureAuthHelper.getAzureTokenCredentials(null));
}
#location 17
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Test
public void testGetAzureTokenCredentials() throws Exception {
// 1. use azure-secret.json
File testConfigDir = new File(this.getClass().getResource("/azure-login/azure-secret.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
AzureTokenCredentials cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
// 2. use azure cli(non SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/default/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null).getAzureTokenCredentials();
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials cliCred = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cliCred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", cliCred.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cliCred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 3. use azure cli(SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/sp/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null).getAzureTokenCredentials();
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials azureCliCredential = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", azureCliCredential.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 4. use cloud shell
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, "azure");
assertTrue(AzureAuthHelper.isInCloudShell());
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, "non-exist-folder");
cred = AzureAuthHelper.getAzureTokenCredentials(null).getAzureTokenCredentials();
assertNotNull(cred);
assertTrue(cred instanceof MSICredentials);
// 5. all of the ways have been tried
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, null);
assertNull(AzureAuthHelper.getAzureTokenCredentials(null));
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@Test
public void testGetAzureTokenCredentials() throws Exception {
// 1. use azure-secret.json
File testConfigDir = new File(this.getClass().getResource("/azure-login/azure-secret.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
AzureTokenCredentials cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
// 2. use azure cli(non SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/default/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials cliCred = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cliCred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", cliCred.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cliCred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 3. use azure cli(SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/sp/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof ApplicationTokenCredentials);
final ApplicationTokenCredentials applicationTokenCredentials = (ApplicationTokenCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", applicationTokenCredentials.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 4. use cloud shell
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, "azure");
assertTrue(AzureAuthHelper.isInCloudShell());
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, "non-exist-folder");
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof MSICredentials);
// 5. all of the ways have been tried
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, null);
assertNull(AzureAuthHelper.getAzureTokenCredentials(null));
}
#location 6
#vulnerability type NULL_DEREFERENCE
|
#fixed code
@Test
public void testGetAzureTokenCredentials() throws Exception {
// 1. use azure-secret.json
File testConfigDir = new File(this.getClass().getResource("/azure-login/azure-secret.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
AzureTokenCredentials cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
// 2. use azure cli(non SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/default/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials cliCred = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cliCred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", cliCred.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cliCred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 3. use azure cli(SP)
testConfigDir = new File(this.getClass().getResource("/azure-cli/sp/azureProfile.json").getFile()).getParentFile();
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, testConfigDir.getAbsolutePath());
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof AzureCliCredentials);
final AzureCliCredentials azureCliCredential = (AzureCliCredentials) cred;
assertEquals("00000000-0000-0000-0000-000000000001", cred.defaultSubscriptionId());
assertEquals("00000000-0000-0000-0000-000000000002", azureCliCredential.clientId());
assertEquals("00000000-0000-0000-0000-000000000003", cred.domain());
assertEquals(AzureEnvironment.AZURE_CHINA, cliCred.environment());
// 4. use cloud shell
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, "azure");
assertTrue(AzureAuthHelper.isInCloudShell());
TestHelper.injectEnvironmentVariable(Constants.AZURE_CONFIG_DIR, "non-exist-folder");
cred = AzureAuthHelper.getAzureTokenCredentials(null);
assertNotNull(cred);
assertTrue(cred instanceof MSICredentials);
// 5. all of the ways have been tried
TestHelper.injectEnvironmentVariable(Constants.CLOUD_SHELL_ENV_KEY, null);
assertNull(AzureAuthHelper.getAzureTokenCredentials(null));
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
@IocBean(name = "beetlsqlConnectionSource")
public ConnectionSource createConnectionSource(@Inject DataSource dataSource) {
DataSource[] slaves = null;
if (Lang.loadClassQuite("org.nutz.boot.starter.jdbc.DataSourceStarter") != null) {
DataSource slaveDataSource = DataSourceStarter.getSlaveDataSource(ioc, conf);
if (slaveDataSource != null)
slaves = new DataSource[] {slaveDataSource};
}
if (conf.getBoolean(PROP_TRANS, true)) {
// 默认事务管理,就是没有管理
return new DefaultConnectionSource(dataSource, slaves);
}
// 支持 Trans.exec 或者 @Aop(TransAop.READ_COMMITTED)
return new NutzConnectionSource(dataSource, slaves);
}
#location 11
#vulnerability type RESOURCE_LEAK
|
#fixed code
@IocBean(name = "beetlsqlConnectionSource")
public ConnectionSource createConnectionSource(@Inject DataSource dataSource) {
DataSource[] slaves = null;
if (Lang.loadClassQuite("org.nutz.boot.starter.jdbc.DataSourceStarter") != null) {
DataSource slaveDataSource = DataSourceStarter.getSlaveDataSource(ioc, conf, "jdbc.slave.");
if (slaveDataSource != null)
slaves = new DataSource[] {slaveDataSource};
}
if (conf.getBoolean(PROP_TRANS, true)) {
// 默认事务管理,就是没有管理
return new DefaultConnectionSource(dataSource, slaves);
}
// 支持 Trans.exec 或者 @Aop(TransAop.READ_COMMITTED)
return new NutzConnectionSource(dataSource, slaves);
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 25
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 3
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 6
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void _run() throws Exception {
Stopwatch sw = Stopwatch.begin();
// 各种预备操作
this.prepare();
if (printProcDoc) {
PropDocReader docReader = new PropDocReader(ctx);
docReader.load();
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 依次启动
try {
ctx.init();
ctx.startServers();
if (mainClass.getAnnotation(IocBean.class) != null)
ctx.getIoc().get(mainClass);
sw.stop();
log.infof("NB started : %sms", sw.du());
synchronized (lock) {
lock.wait();
}
}
catch (Throwable e) {
log.error("something happen!!", e);
}
// 收尾
ctx.stopServers();
ctx.depose();
}
#location 20
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void _run() throws Exception {
Stopwatch sw = Stopwatch.begin();
// 各种预备操作
this.prepare();
if (printProcDoc) {
PropDocReader docReader = new PropDocReader(ctx);
docReader.load();
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 依次启动
try {
ctx.init();
ctx.startServers();
if (ctx.getMainClass().getAnnotation(IocBean.class) != null)
ctx.getIoc().get(ctx.getMainClass());
sw.stop();
log.infof("NB started : %sms", sw.du());
synchronized (lock) {
lock.wait();
}
}
catch (Throwable e) {
log.error("something happen!!", e);
}
// 收尾
ctx.stopServers();
ctx.depose();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 24
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareStarterClassList() throws Exception {
starterClasses = new ArrayList<>();
HashSet<String> classNames = new HashSet<>();
Enumeration<URL> _en = ctx.getClassLoader().getResources("META-INF/nutz/org.nutz.boot.starter.NbStarter");
while (_en.hasMoreElements()) {
URL url = _en.nextElement();
log.debug("Found " + url);
try (InputStream ins = url.openStream()) {
InputStreamReader reader = new InputStreamReader(ins);
String tmp = Streams.readAndClose(reader);
if (!Strings.isBlank(tmp)) {
for (String _tmp : Strings.splitIgnoreBlank(tmp, "[\n]")) {
String className = _tmp.trim();
if (!classNames.add(className))
continue;
Class<?> klass = ctx.getClassLoader().loadClass(className);
if (!klass.getPackage().getName().startsWith(NbApp.class.getPackage().getName()) && klass.getAnnotation(IocBean.class) != null) {
starterIocLoader.addClass(klass);
}
starterClasses.add(klass);
}
}
}
}
}
#location 20
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareStarterClassList() throws Exception {
HashSet<String> classNames = new HashSet<>();
Enumeration<URL> _en = ctx.getClassLoader().getResources("META-INF/nutz/org.nutz.boot.starter.NbStarter");
while (_en.hasMoreElements()) {
URL url = _en.nextElement();
log.debug("Found " + url);
try (InputStream ins = url.openStream()) {
InputStreamReader reader = new InputStreamReader(ins);
String tmp = Streams.readAndClose(reader);
if (!Strings.isBlank(tmp)) {
for (String _tmp : Strings.splitIgnoreBlank(tmp, "[\n]")) {
String className = _tmp.trim();
if (!classNames.add(className))
continue;
Class<?> klass = ctx.getClassLoader().loadClass(className);
if (!klass.getPackage().getName().startsWith(NbApp.class.getPackage().getName()) && klass.getAnnotation(IocBean.class) != null) {
starterIocLoader.addClass(klass);
}
starterClasses.add(klass);
}
}
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareStarterClassList() throws Exception {
starterClasses = new ArrayList<>();
HashSet<String> classNames = new HashSet<>();
Enumeration<URL> _en = ctx.getClassLoader().getResources("META-INF/nutz/org.nutz.boot.starter.NbStarter");
while (_en.hasMoreElements()) {
URL url = _en.nextElement();
log.debug("Found " + url);
try (InputStream ins = url.openStream()) {
InputStreamReader reader = new InputStreamReader(ins);
String tmp = Streams.readAndClose(reader);
if (!Strings.isBlank(tmp)) {
for (String _tmp : Strings.splitIgnoreBlank(tmp, "[\n]")) {
String className = _tmp.trim();
if (!classNames.add(className))
continue;
Class<?> klass = ctx.getClassLoader().loadClass(className);
if (!klass.getPackage().getName().startsWith(NbApp.class.getPackage().getName()) && klass.getAnnotation(IocBean.class) != null) {
starterIocLoader.addClass(klass);
}
starterClasses.add(klass);
}
}
}
}
}
#location 2
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareStarterClassList() throws Exception {
HashSet<String> classNames = new HashSet<>();
Enumeration<URL> _en = ctx.getClassLoader().getResources("META-INF/nutz/org.nutz.boot.starter.NbStarter");
while (_en.hasMoreElements()) {
URL url = _en.nextElement();
log.debug("Found " + url);
try (InputStream ins = url.openStream()) {
InputStreamReader reader = new InputStreamReader(ins);
String tmp = Streams.readAndClose(reader);
if (!Strings.isBlank(tmp)) {
for (String _tmp : Strings.splitIgnoreBlank(tmp, "[\n]")) {
String className = _tmp.trim();
if (!classNames.add(className))
continue;
Class<?> klass = ctx.getClassLoader().loadClass(className);
if (!klass.getPackage().getName().startsWith(NbApp.class.getPackage().getName()) && klass.getAnnotation(IocBean.class) != null) {
starterIocLoader.addClass(klass);
}
starterClasses.add(klass);
}
}
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 5
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 22
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareIoc() throws Exception {
if (ctx.getComboIocLoader() == null) {
int asyncPoolSize = ctx.getConfigureLoader().get().getInt("nutz.ioc.async.poolSize", 64);
List<String> args = new ArrayList<>();
args.add("*js");
args.add("ioc/");
args.add("*tx");
args.add("*async");
args.add(""+asyncPoolSize);
args.add("*anno");
args.add(ctx.getPackage());
IocBy iocBy = ctx.getMainClass().getAnnotation(IocBy.class);
if (iocBy != null) {
String[] tmp = iocBy.args();
ArrayList<String> _args = new ArrayList<>();
for (int i=0;i<tmp.length;i++) {
if (tmp[i].startsWith("*")) {
if (!_args.isEmpty()) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
_args.clear();
}
}
_args.add(tmp[i]);
}
if (_args.size() > 0) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
}
}
ctx.setComboIocLoader(new ComboIocLoader(args.toArray(new String[args.size()])));
}
// 用于加载Starter的IocLoader
starterIocLoader = new AnnotationIocLoader(NbApp.class.getPackage().getName() + ".starter");
ctx.getComboIocLoader().addLoader(starterIocLoader);
if (ctx.getIoc() == null) {
ctx.setIoc(new NutIoc(ctx.getComboIocLoader()));
}
// 把核心对象放进ioc容器
if (!ctx.ioc.has("appContext")){
Ioc2 ioc2 = (Ioc2)ctx.getIoc();
ioc2.getIocContext().save("app", "appContext", new ObjectProxy(ctx));
ioc2.getIocContext().save("app", "conf", new ObjectProxy(ctx.getConf()));
ioc2.getIocContext().save("app", "nbApp", new ObjectProxy(this));
}
}
#location 49
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareIoc() {
if (ctx.getIoc() == null) {
ctx.setIoc(new NutIoc(ctx.getComboIocLoader()));
}
// 把核心对象放进ioc容器
if (!ctx.ioc.has("appContext")){
Ioc2 ioc2 = (Ioc2)ctx.getIoc();
ioc2.getIocContext().save("app", "appContext", new ObjectProxy(ctx));
ioc2.getIocContext().save("app", "conf", new ObjectProxy(ctx.getConf()));
ioc2.getIocContext().save("app", "nbApp", new ObjectProxy(this));
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
if (getAppContext().getConf().get("nutz.propdoc.packages") != null) {
for (String pkg : Strings.splitIgnoreBlank(getAppContext().getConf().get("nutz.propdoc.packages"))) {
for (Class<?> klass : Scans.me().scanPackage(pkg)) {
if (klass.isInterface())
continue;
docReader.addClass(klass);
}
}
}
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
#location 25
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 配置信息准备好后,进行外部jar包对象Scan
PropertiesProxy propertiesProxy = ctx.getConf();
if(propertiesProxy.containsKey(scansPaths)) {
log.debugf("has scansPaths...");
String scansPathsValue = propertiesProxy.get(scansPaths);
// 适配多路径
for (String path : scansPathsValue.split(";")) {
path = AppContext.getDefault().getBasePath() + File.separator + path;
log.debugf("scan path %s", path);
for (File jar : Files.ls(path, ".jar$", null)) {
log.infof("addResourceFile:%s", jar.getPath());
Scans.me().addResourceLocation(new JarResourceLocation(jar.getPath()));
}
}
}
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
if (getAppContext().getConf().get("nutz.propdoc.packages") != null) {
for (String pkg : Strings.splitIgnoreBlank(getAppContext().getConf().get("nutz.propdoc.packages"))) {
for (Class<?> klass : Scans.me().scanPackage(pkg)) {
if (klass.isInterface())
continue;
docReader.addClass(klass);
}
}
}
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 25
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
#location 10
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
if (getAppContext().getConf().get("nutz.propdoc.packages") != null) {
for (String pkg : Strings.splitIgnoreBlank(getAppContext().getConf().get("nutz.propdoc.packages"))) {
for (Class<?> klass : Scans.me().scanPackage(pkg)) {
if (klass.isInterface())
continue;
docReader.addClass(klass);
}
}
}
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void run() {
try {
_run();
}
catch (Throwable e) {
Logs.get().error("something happen", e);
}
}
#location 3
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void run() {
try {
if (execute()) {
synchronized (lock) {
lock.wait();
}
}
// 收尾
_shutdown();
}
catch (Throwable e) {
Logs.get().error("something happen", e);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareIoc() throws Exception {
if (ctx.getComboIocLoader() == null) {
int asyncPoolSize = ctx.getConfigureLoader().get().getInt("nutz.ioc.async.poolSize", 64);
List<String> args = new ArrayList<>();
args.add("*js");
args.add("ioc/");
args.add("*tx");
args.add("*async");
args.add(""+asyncPoolSize);
args.add("*anno");
args.add(ctx.getPackage());
IocBy iocBy = ctx.getMainClass().getAnnotation(IocBy.class);
if (iocBy != null) {
String[] tmp = iocBy.args();
ArrayList<String> _args = new ArrayList<>();
for (int i=0;i<tmp.length;i++) {
if (tmp[i].startsWith("*")) {
if (!_args.isEmpty()) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
_args.clear();
}
}
_args.add(tmp[i]);
}
if (_args.size() > 0) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
}
}
ctx.setComboIocLoader(new ComboIocLoader(args.toArray(new String[args.size()])));
}
// 用于加载Starter的IocLoader
starterIocLoader = new AnnotationIocLoader(NbApp.class.getPackage().getName() + ".starter");
ctx.getComboIocLoader().addLoader(starterIocLoader);
if (ctx.getIoc() == null) {
ctx.setIoc(new NutIoc(ctx.getComboIocLoader()));
}
// 把核心对象放进ioc容器
if (!ctx.ioc.has("appContext")){
Ioc2 ioc2 = (Ioc2)ctx.getIoc();
ioc2.getIocContext().save("app", "appContext", new ObjectProxy(ctx));
ioc2.getIocContext().save("app", "conf", new ObjectProxy(ctx.getConf()));
ioc2.getIocContext().save("app", "nbApp", new ObjectProxy(this));
}
}
#location 45
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareIoc() {
if (ctx.getIoc() == null) {
ctx.setIoc(new NutIoc(ctx.getComboIocLoader()));
}
// 把核心对象放进ioc容器
if (!ctx.ioc.has("appContext")){
Ioc2 ioc2 = (Ioc2)ctx.getIoc();
ioc2.getIocContext().save("app", "appContext", new ObjectProxy(ctx));
ioc2.getIocContext().save("app", "conf", new ObjectProxy(ctx.getConf()));
ioc2.getIocContext().save("app", "nbApp", new ObjectProxy(this));
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 12
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
#location 20
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
if (getAppContext().getConf().get("nutz.propdoc.packages") != null) {
for (String pkg : Strings.splitIgnoreBlank(getAppContext().getConf().get("nutz.propdoc.packages"))) {
for (Class<?> klass : Scans.me().scanPackage(pkg)) {
if (klass.isInterface())
continue;
docReader.addClass(klass);
}
}
}
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareConfigureLoader() throws Exception {
if (ctx.getConfigureLoader() == null) {
String cnfLoader = ctx.getEnvHolder().get("nutz.boot.base.ConfigureLoader");
ConfigureLoader configureLoader;
if (Strings.isBlank(cnfLoader)) {
configureLoader = new PropertiesConfigureLoader();
} else {
configureLoader = (ConfigureLoader) ctx.getClassLoader().loadClass(cnfLoader).newInstance();
}
configureLoader.setCommandLineProperties(allowCommandLineProperties, args);
aware(configureLoader);
ctx.setConfigureLoader(configureLoader);
if (configureLoader instanceof LifeCycle)
((LifeCycle) configureLoader).init();
}
}
#location 11
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareConfigureLoader() throws Exception {
if (ctx.getConfigureLoader() == null) {
ConfigureLoader configureLoader = null;
InputStream ins = ctx.getResourceLoader().get("META-INF/nutz/org.nutz.boot.config.ConfigureLoader");
if (ins != null) {
String cnfLoader = new String(Streams.readBytes(ins)).trim();
if (!Strings.isBlank(cnfLoader)) {
log.debugf("using %s as ConfigureLoader", cnfLoader);
configureLoader = (ConfigureLoader) ctx.getClassLoader().loadClass(cnfLoader).newInstance();
}
}
if (configureLoader == null) {
configureLoader = new PropertiesConfigureLoader();
}
configureLoader.setCommandLineProperties(allowCommandLineProperties, args);
aware(configureLoader);
ctx.setConfigureLoader(configureLoader);
if (configureLoader instanceof LifeCycle)
((LifeCycle) configureLoader).init();
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareIoc() throws Exception {
if (ctx.getComboIocLoader() == null) {
int asyncPoolSize = ctx.getConfigureLoader().get().getInt("nutz.ioc.async.poolSize", 64);
List<String> args = new ArrayList<>();
args.add("*js");
args.add("ioc/");
args.add("*tx");
args.add("*async");
args.add(""+asyncPoolSize);
args.add("*anno");
args.add(ctx.getPackage());
IocBy iocBy = ctx.getMainClass().getAnnotation(IocBy.class);
if (iocBy != null) {
String[] tmp = iocBy.args();
ArrayList<String> _args = new ArrayList<>();
for (int i=0;i<tmp.length;i++) {
if (tmp[i].startsWith("*")) {
if (!_args.isEmpty()) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
_args.clear();
}
}
_args.add(tmp[i]);
}
if (_args.size() > 0) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
}
}
ctx.setComboIocLoader(new ComboIocLoader(args.toArray(new String[args.size()])));
}
// 用于加载Starter的IocLoader
starterIocLoader = new AnnotationIocLoader(NbApp.class.getPackage().getName() + ".starter");
ctx.getComboIocLoader().addLoader(starterIocLoader);
if (ctx.getIoc() == null) {
ctx.setIoc(new NutIoc(ctx.getComboIocLoader()));
}
// 把核心对象放进ioc容器
if (!ctx.ioc.has("appContext")){
Ioc2 ioc2 = (Ioc2)ctx.getIoc();
ioc2.getIocContext().save("app", "appContext", new ObjectProxy(ctx));
ioc2.getIocContext().save("app", "conf", new ObjectProxy(ctx.getConfigureLoader().get()));
}
}
#location 11
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareIoc() throws Exception {
if (ctx.getComboIocLoader() == null) {
int asyncPoolSize = ctx.getConfigureLoader().get().getInt("nutz.ioc.async.poolSize", 64);
List<String> args = new ArrayList<>();
args.add("*js");
args.add("ioc/");
args.add("*tx");
args.add("*async");
args.add(""+asyncPoolSize);
args.add("*anno");
args.add(ctx.getPackage());
IocBy iocBy = ctx.getMainClass().getAnnotation(IocBy.class);
if (iocBy != null) {
String[] tmp = iocBy.args();
ArrayList<String> _args = new ArrayList<>();
for (int i=0;i<tmp.length;i++) {
if (tmp[i].startsWith("*")) {
if (!_args.isEmpty()) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
_args.clear();
}
}
_args.add(tmp[i]);
}
if (_args.size() > 0) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
}
}
ctx.setComboIocLoader(new ComboIocLoader(args.toArray(new String[args.size()])));
}
// 用于加载Starter的IocLoader
starterIocLoader = new AnnotationIocLoader(NbApp.class.getPackage().getName() + ".starter");
ctx.getComboIocLoader().addLoader(starterIocLoader);
if (ctx.getIoc() == null) {
ctx.setIoc(new NutIoc(ctx.getComboIocLoader()));
}
// 把核心对象放进ioc容器
if (!ctx.ioc.has("appContext")){
Ioc2 ioc2 = (Ioc2)ctx.getIoc();
ioc2.getIocContext().save("app", "appContext", new ObjectProxy(ctx));
ioc2.getIocContext().save("app", "conf", new ObjectProxy(ctx.getConf()));
ioc2.getIocContext().save("app", "nbApp", new ObjectProxy(this));
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
#location 42
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
if (getAppContext().getConf().get("nutz.propdoc.packages") != null) {
for (String pkg : Strings.splitIgnoreBlank(getAppContext().getConf().get("nutz.propdoc.packages"))) {
for (Class<?> klass : Scans.me().scanPackage(pkg)) {
if (klass.isInterface())
continue;
docReader.addClass(klass);
}
}
}
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareIoc() throws Exception {
if (ctx.getComboIocLoader() == null) {
int asyncPoolSize = ctx.getConfigureLoader().get().getInt("nutz.ioc.async.poolSize", 64);
List<String> args = new ArrayList<>();
args.add("*js");
args.add("ioc/");
args.add("*tx");
args.add("*async");
args.add(""+asyncPoolSize);
args.add("*anno");
args.add(ctx.getPackage());
IocBy iocBy = ctx.getMainClass().getAnnotation(IocBy.class);
if (iocBy != null) {
String[] tmp = iocBy.args();
ArrayList<String> _args = new ArrayList<>();
for (int i=0;i<tmp.length;i++) {
if (tmp[i].startsWith("*")) {
if (!_args.isEmpty()) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
_args.clear();
}
}
_args.add(tmp[i]);
}
if (_args.size() > 0) {
switch (_args.get(0)) {
case "*tx":
case "*async":
case "*anno":
case "*js":
break;
default:
args.addAll(_args);
}
}
}
ctx.setComboIocLoader(new ComboIocLoader(args.toArray(new String[args.size()])));
}
// 用于加载Starter的IocLoader
starterIocLoader = new AnnotationIocLoader(NbApp.class.getPackage().getName() + ".starter");
ctx.getComboIocLoader().addLoader(starterIocLoader);
if (ctx.getIoc() == null) {
ctx.setIoc(new NutIoc(ctx.getComboIocLoader()));
}
// 把核心对象放进ioc容器
if (!ctx.ioc.has("appContext")){
Ioc2 ioc2 = (Ioc2)ctx.getIoc();
ioc2.getIocContext().save("app", "appContext", new ObjectProxy(ctx));
ioc2.getIocContext().save("app", "conf", new ObjectProxy(ctx.getConf()));
ioc2.getIocContext().save("app", "nbApp", new ObjectProxy(this));
}
}
#location 48
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareIoc() {
if (ctx.getIoc() == null) {
ctx.setIoc(new NutIoc(ctx.getComboIocLoader()));
}
// 把核心对象放进ioc容器
if (!ctx.ioc.has("appContext")){
Ioc2 ioc2 = (Ioc2)ctx.getIoc();
ioc2.getIocContext().save("app", "appContext", new ObjectProxy(ctx));
ioc2.getIocContext().save("app", "conf", new ObjectProxy(ctx.getConf()));
ioc2.getIocContext().save("app", "nbApp", new ObjectProxy(this));
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 18
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void init() throws Exception {
// 创建基础服务器
QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setIdleTimeout(getThreadPoolIdleTimeout());
threadPool.setMinThreads(getMinThreads());
threadPool.setMaxThreads(getMaxThreads());
server = new Server(threadPool);
HttpConfiguration httpConfig = conf.make(HttpConfiguration.class, "jetty.httpConfig.");
HttpConnectionFactory httpFactory = new HttpConnectionFactory(httpConfig);
ServerConnector connector = new ServerConnector(server, httpFactory);
connector.setHost(getHost());
connector.setPort(getPort());
connector.setIdleTimeout(getIdleTimeout());
server.setConnectors(new Connector[]{connector});
// 设置应用上下文
wac = new WebAppContext();
wac.setContextPath(getContextPath());
// wac.setExtractWAR(false);
// wac.setCopyWebInf(true);
// wac.setProtectedTargets(new String[]{"/java", "/javax", "/org",
// "/net", "/WEB-INF", "/META-INF"});
wac.setTempDirectory(new File("temp"));
wac.setClassLoader(classLoader);
wac.setConfigurationDiscovered(true);
if (System.getProperty("os.name").toLowerCase().contains("windows")) {
wac.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false");
}
List<Resource> resources = new ArrayList<>();
for (String resourcePath : getResourcePaths()) {
File f = new File(resourcePath);
if (f.exists()) {
resources.add(Resource.newResource(f));
}
Enumeration<URL> urls = appContext.getClassLoader().getResources(resourcePath);
while (urls.hasMoreElements()) {
resources.add(Resource.newResource(urls.nextElement()));
}
}
if (conf.has(PROP_STATIC_PATH_LOCAL)) {
File f = new File(conf.get(PROP_STATIC_PATH_LOCAL));
if (f.exists()) {
log.debug("found static local path, add it : " + f.getAbsolutePath());
resources.add(0, Resource.newResource(f));
} else {
log.debug("static local path not exist, skip it : " + f.getPath());
}
}
wac.setBaseResource(new ResourceCollection(resources.toArray(new Resource[resources.size()])) {
@Override
public Resource addPath(String path) throws IOException, MalformedURLException {
// TODO 为啥ResourceCollection读取WEB-INF的时候返回null
// 从而导致org.eclipse.jetty.webapp.WebAppContext.getWebInf()抛NPE
// 先临时hack吧
Resource resource = super.addPath(path);
if (resource == null && "WEB-INF/".equals(path)) {
return Resource.newResource(new File("XXXX"));
}
return resource;
}
});
if (conf.getBoolean(PROP_GZIP_ENABLE, false)) {
GzipHandler gzip = new GzipHandler();
gzip.setHandler(wac);
gzip.setMinGzipSize(conf.getInt(PROP_GZIP_MIN_CONTENT_SIZE, 512));
gzip.setCompressionLevel(conf.getInt(PROP_GZIP_LEVEL, Deflater.DEFAULT_COMPRESSION));
server.setHandler(gzip);
}
else {
server.setHandler(wac);
}
List<String> list = Configuration.ClassList.serverDefault(server);
list.add("org.eclipse.jetty.annotations.AnnotationConfiguration");
wac.setConfigurationClasses(list);
wac.getServletContext().setExtendedListenerTypes(true);
wac.getSessionHandler().setMaxInactiveInterval(getSessionTimeout());
ErrorHandler ep = Lang.first(appContext.getBeans(ErrorHandler.class));
if(ep == null){
ErrorPageErrorHandler handler = new ErrorPageErrorHandler();
handler.setErrorPages(getErrorPages());
ep = handler;
}
wac.setErrorHandler(ep);
wac.setWelcomeFiles(getWelcomeFiles());
// 设置一下额外的东西
server.setAttribute("org.eclipse.jetty.server.Request.maxFormContentSize", getMaxFormContentSize());
server.setDumpAfterStart(false);
server.setDumpBeforeStop(false);
server.setStopAtShutdown(true);
addNutzSupport();
ServerContainer sc = WebSocketServerContainerInitializer.configureContext(wac);
for (Class<?> klass : Scans.me().scanPackage(appContext.getPackage())) {
if (klass.getAnnotation(ServerEndpoint.class) != null) {
sc.addEndpoint(klass);
}
}
}
#location 15
#vulnerability type RESOURCE_LEAK
|
#fixed code
public void init() throws Exception {
// 创建基础服务器
QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setIdleTimeout(getThreadPoolIdleTimeout());
threadPool.setMinThreads(getMinThreads());
threadPool.setMaxThreads(getMaxThreads());
server = new Server(threadPool);
HttpConfiguration httpConfig = conf.make(HttpConfiguration.class, "jetty.httpConfig.");
HttpConnectionFactory httpFactory = new HttpConnectionFactory(httpConfig);
connector = new ServerConnector(server, httpFactory);
connector.setHost(getHost());
connector.setPort(getPort());
connector.setIdleTimeout(getIdleTimeout());
server.setConnectors(new Connector[]{connector});
// 设置应用上下文
wac = new WebAppContext();
wac.setContextPath(getContextPath());
// wac.setExtractWAR(false);
// wac.setCopyWebInf(true);
// wac.setProtectedTargets(new String[]{"/java", "/javax", "/org",
// "/net", "/WEB-INF", "/META-INF"});
wac.setTempDirectory(new File("temp"));
wac.setClassLoader(classLoader);
wac.setConfigurationDiscovered(true);
if (System.getProperty("os.name").toLowerCase().contains("windows")) {
wac.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false");
}
List<Resource> resources = new ArrayList<>();
for (String resourcePath : getResourcePaths()) {
File f = new File(resourcePath);
if (f.exists()) {
resources.add(Resource.newResource(f));
}
Enumeration<URL> urls = appContext.getClassLoader().getResources(resourcePath);
while (urls.hasMoreElements()) {
resources.add(Resource.newResource(urls.nextElement()));
}
}
if (conf.has(PROP_STATIC_PATH_LOCAL)) {
File f = new File(conf.get(PROP_STATIC_PATH_LOCAL));
if (f.exists()) {
log.debug("found static local path, add it : " + f.getAbsolutePath());
resources.add(0, Resource.newResource(f));
} else {
log.debug("static local path not exist, skip it : " + f.getPath());
}
}
wac.setBaseResource(new ResourceCollection(resources.toArray(new Resource[resources.size()])) {
@Override
public Resource addPath(String path) throws IOException, MalformedURLException {
// TODO 为啥ResourceCollection读取WEB-INF的时候返回null
// 从而导致org.eclipse.jetty.webapp.WebAppContext.getWebInf()抛NPE
// 先临时hack吧
Resource resource = super.addPath(path);
if (resource == null && "WEB-INF/".equals(path)) {
return Resource.newResource(new File("XXXX"));
}
return resource;
}
});
if (conf.getBoolean(PROP_GZIP_ENABLE, false)) {
GzipHandler gzip = new GzipHandler();
gzip.setHandler(wac);
gzip.setMinGzipSize(conf.getInt(PROP_GZIP_MIN_CONTENT_SIZE, 512));
gzip.setCompressionLevel(conf.getInt(PROP_GZIP_LEVEL, Deflater.DEFAULT_COMPRESSION));
server.setHandler(gzip);
}
else {
server.setHandler(wac);
}
List<String> list = Configuration.ClassList.serverDefault(server);
list.add("org.eclipse.jetty.annotations.AnnotationConfiguration");
wac.setConfigurationClasses(list);
wac.getServletContext().setExtendedListenerTypes(true);
wac.getSessionHandler().setMaxInactiveInterval(getSessionTimeout());
ErrorHandler ep = Lang.first(appContext.getBeans(ErrorHandler.class));
if(ep == null){
ErrorPageErrorHandler handler = new ErrorPageErrorHandler();
handler.setErrorPages(getErrorPages());
ep = handler;
}
wac.setErrorHandler(ep);
wac.setWelcomeFiles(getWelcomeFiles());
// 设置一下额外的东西
server.setAttribute("org.eclipse.jetty.server.Request.maxFormContentSize", getMaxFormContentSize());
server.setDumpAfterStart(false);
server.setDumpBeforeStop(false);
server.setStopAtShutdown(true);
addNutzSupport();
ServerContainer sc = WebSocketServerContainerInitializer.configureContext(wac);
for (Class<?> klass : Scans.me().scanPackage(appContext.getPackage())) {
if (klass.getAnnotation(ServerEndpoint.class) != null) {
sc.addEndpoint(klass);
}
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
#location 15
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepare() throws Exception {
if (prepared)
return;
// 初始化上下文
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.before));
this.prepareBasic();
listeners.forEach((listener)->listener.whenPrepareBasic(this, EventType.after));
// 打印Banner,暂时不可配置具体的类
new SimpleBannerPrinter().printBanner(ctx);
// 配置信息要准备好
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.before));
this.prepareConfigureLoader();
listeners.forEach((listener)->listener.whenPrepareConfigureLoader(this, EventType.after));
// 创建IocLoader体系
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.before));
prepareIocLoader();
listeners.forEach((listener)->listener.whenPrepareIocLoader(this, EventType.after));
// 加载各种starter
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.before));
prepareStarterClassList();
listeners.forEach((listener)->listener.whenPrepareStarterClassList(this, EventType.after));
// 打印配置文档
if (printProcDoc) {
PropDocReader docReader = new PropDocReader();
docReader.load(starterClasses);
if (getAppContext().getConf().get("nutz.propdoc.packages") != null) {
for (String pkg : Strings.splitIgnoreBlank(getAppContext().getConf().get("nutz.propdoc.packages"))) {
for (Class<?> klass : Scans.me().scanPackage(pkg)) {
if (klass.isInterface())
continue;
docReader.addClass(klass);
}
}
}
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 创建Ioc容器
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.before));
prepareIoc();
listeners.forEach((listener)->listener.whenPrepareIoc(this, EventType.after));
// 生成Starter实例
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.before));
prepareStarterInstance();
listeners.forEach((listener)->listener.whenPrepareStarterInstance(this, EventType.after));
// 从Ioc容器检索Listener
listeners.addAll(ctx.getBeans(NbAppEventListener.class));
prepared = true;
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void prepareBasic() throws Exception {
if (this.ctx == null) {
ctx = AppContext.getDefault();
}
if (ctx.getMainClass() == null && mainClass != null)
ctx.setMainClass(mainClass);
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
#location 9
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void prepareBasic() throws Exception {
// 检查ClassLoader的情况
if (ctx.getClassLoader() == null)
ctx.setClassLoader(NbApp.class.getClassLoader());
if (ctx.getEnvHolder() == null) {
ctx.setEnvHolder(new SystemPropertiesEnvHolder());
}
// 看看日志应该用哪个
String logAdapter = ctx.getEnvHolder().get("nutz.boot.base.LogAdapter");
if (!Strings.isBlank(logAdapter)) {
Logs.setAdapter((LogAdapter) ctx.getClassLoader().loadClass(logAdapter).newInstance());
}
log = Logs.get();
// 资源加载器
if (ctx.getResourceLoader() == null) {
ResourceLoader resourceLoader = new SimpleResourceLoader();
aware(resourceLoader);
ctx.setResourceLoader(resourceLoader);
}
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
#vulnerable code
public void _run() throws Exception {
Stopwatch sw = Stopwatch.begin();
// 各种预备操作
this.prepare();
if (printProcDoc) {
PropDocReader docReader = new PropDocReader(ctx);
docReader.load();
Logs.get().info("Configure Manual:\r\n" + docReader.toMarkdown());
}
// 依次启动
try {
ctx.init();
ctx.startServers();
if (ctx.getMainClass().getAnnotation(IocBean.class) != null)
ctx.getIoc().get(ctx.getMainClass());
sw.stop();
log.infof("NB started : %sms", sw.du());
synchronized (lock) {
lock.wait();
}
}
catch (Throwable e) {
log.error("something happen!!", e);
}
// 收尾
ctx.stopServers();
ctx.depose();
}
#location 23
#vulnerability type THREAD_SAFETY_VIOLATION
|
#fixed code
public void _run() throws Exception {
Stopwatch sw = Stopwatch.begin();
// 各种预备操作
this.prepare();
// 依次启动
try {
ctx.init();
ctx.startServers();
if (ctx.getMainClass().getAnnotation(IocBean.class) != null)
ctx.getIoc().get(ctx.getMainClass());
sw.stop();
log.infof("NB started : %sms", sw.du());
synchronized (lock) {
lock.wait();
}
}
catch (Throwable e) {
log.error("something happen!!", e);
}
// 收尾
ctx.stopServers();
ctx.depose();
}
|
Below is the vulnerable code, please generate the patch based on the following information.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.